Skip to content

Commit ab5803b

Browse files
committed
9p: changed 9pfs binary compilation to installation from COPR repo
Removed the container-compilation process and changed it to simple installation from a custom COPR repository that contains the binary.
1 parent 27cf698 commit ab5803b

File tree

3 files changed

+7
-32
lines changed

3 files changed

+7
-32
lines changed

9pfs/Dockerfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

createdisk-library.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -426,18 +426,3 @@ function copy_systemd_units() {
426426

427427
${SSH} core@${VM_IP} -- 'rm -rf /home/core/systemd-units /home/core/systemd-scripts'
428428
}
429-
430-
function compile_and_extract_9pfs() {
431-
${SCP} -r 9pfs core@${VM_IP}:/home/core/
432-
${SSH} core@${VM_IP} 'sudo bash -e -x -s' <<EOF
433-
cd 9pfs
434-
podman build -t 9pfs-builder .
435-
podman create --name extract-temp 9pfs-builder
436-
podman cp extract-temp:/src/9pfs/9pfs ./9pfs
437-
podman rm extract-temp
438-
sudo cp 9pfs /usr/local/bin
439-
cd ..
440-
rm -rf 9pfs
441-
podman rmi 9pfs-builder:latest registry.access.redhat.com/ubi9:9.5
442-
EOF
443-
}

createdisk.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,13 @@ EOF
162162
ADDITIONAL_PACKAGES+=" qemu-user-static-x86"
163163
fi
164164

165+
# install 9pfs binary from COPR repo so that it can be used to
166+
# set up 9p file sharing on Windows
167+
if [ "${SNC_GENERATE_WINDOWS_BUNDLE}" != "0" ]; then
168+
sudo dnf -y copr enable mskvarla/9pfs
169+
ADDITIONAL_PACKAGES+=" 9pfs"
170+
fi
171+
165172
# Beyond this point, packages added to the ADDITIONAL_PACKAGES variable won’t be installed in the guest
166173
install_additional_packages ${VM_IP}
167174
copy_systemd_units
@@ -202,12 +209,6 @@ ${SSH} core@${VM_IP} -- 'sudo sed -i "s/^preserve_hostname: false$/preserve_host
202209
# Cleanup cloud-init config
203210
${SSH} core@${VM_IP} -- "sudo cloud-init clean --logs"
204211

205-
if [ "${ARCH}" == "x86_64" ] && [ "${SNC_GENERATE_WINDOWS_BUNDLE}" != "0" ]; then
206-
# compile 9pfs binary using UBI image and extract the binary
207-
# so that it can be used to set up a 9p filesystem on Windows
208-
compile_and_extract_9pfs
209-
fi
210-
211212
# Shutdown the VM
212213
shutdown_vm ${VM_NAME}
213214

0 commit comments

Comments
 (0)