File tree Expand file tree Collapse file tree 3 files changed +11
-33
lines changed Expand file tree Collapse file tree 3 files changed +11
-33
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -426,18 +426,3 @@ function copy_systemd_units() {
426
426
427
427
${SSH} core@${VM_IP} -- ' rm -rf /home/core/systemd-units /home/core/systemd-scripts'
428
428
}
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
- }
Original file line number Diff line number Diff line change 163
163
PRE_DOWNLOADED_ADDITIONAL_PACKAGES+=" qemu-user-static-x86"
164
164
fi
165
165
166
- # Beyond this point, packages added to the ADDITIONAL_PACKAGES variable won’t be installed in the guest
166
+ # install 9pfs binary from COPR repo so that it can be used to
167
+ # set up 9p file sharing on Windows
168
+ if [ " ${SNC_GENERATE_WINDOWS_BUNDLE} " != " 0" ]; then
169
+ ${SSH} core@${VM_IP} -- " sudo dnf -y copr enable mskvarla/9pfs"
170
+ ${SSH} core@${VM_IP} -- " mkdir -p ~/packages && dnf download --downloadonly --downloaddir ~/packages 9pfs --resolve"
171
+ ${SSH} core@${VM_IP} -- " sudo dnf -y copr disable mskvarla/9pfs"
172
+ PRE_DOWNLOADED_ADDITIONAL_PACKAGES+=" 9pfs"
173
+ fi
174
+
175
+ # Beyond this point, packages added to the ADDITIONAL_PACKAGES and PRE_DOWNLOADED_ADDITIONAL_PACKAGES
176
+ # variables won’t be installed in the guest
167
177
install_additional_packages ${VM_IP}
168
178
copy_systemd_units
169
179
@@ -203,12 +213,6 @@ ${SSH} core@${VM_IP} -- 'sudo sed -i "s/^preserve_hostname: false$/preserve_host
203
213
# Cleanup cloud-init config
204
214
${SSH} core@${VM_IP} -- " sudo cloud-init clean --logs"
205
215
206
- if [ " ${ARCH} " == " x86_64" ] && [ " ${SNC_GENERATE_WINDOWS_BUNDLE} " != " 0" ]; then
207
- # compile 9pfs binary using UBI image and extract the binary
208
- # so that it can be used to set up a 9p filesystem on Windows
209
- compile_and_extract_9pfs
210
- fi
211
-
212
216
# Shutdown the VM
213
217
shutdown_vm ${VM_NAME}
214
218
You can’t perform that action at this time.
0 commit comments