diff options
| author | Dan Williams <dcbw@redhat.com> | 2015-01-27 08:17:16 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2015-01-28 15:14:51 -0600 |
| commit | cbb430d91d8b33a0df7419abb45ffcb799c09e1e (patch) | |
| tree | 6c1533b626532a25ef0179f0ec09c3cc8c184389 | |
| parent | 6771f836ce3518bc75f0cbbed74138f40c890f7d (diff) | |
| download | NetworkManager-cbb430d91d8b33a0df7419abb45ffcb799c09e1e.tar.gz | |
live-vm: use virtio for shared directory
The VVFAT shared directory scheme didn't work reliably, for example
not showing files written on the host in the guest and vice versa.
Use the virtio scheme instead, which does work.
| -rwxr-xr-x | contrib/fedora/nm-live-vm/build.sh | 2 | ||||
| -rwxr-xr-x | contrib/fedora/nm-live-vm/run.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fedora/nm-live-vm/build.sh b/contrib/fedora/nm-live-vm/build.sh index e245dab579..85a77a64a3 100755 --- a/contrib/fedora/nm-live-vm/build.sh +++ b/contrib/fedora/nm-live-vm/build.sh @@ -98,7 +98,7 @@ do_live_vm() { mkdir -p $NAME || exit 1 cp $TREE/boot/vmlinuz* $NAME/vmlinuz || exit 1 mock -r "$ROOT" --chroot "{ ( cd / ; \ - echo '/dev/sda1 /mnt/sda1 vfat defaults 0 0' >> /etc/fstab ; \ + echo 'host0 /mnt/shared 9p x-systemd.automount,x-systemd.device-timeout=10,trans=virtio,version=9p2000.L,rw 0 0' >> /etc/fstab ; \ find -not \( \ -path ./tmp/initramfs.img -o \ -path './var/cache/yum/*' -o \ diff --git a/contrib/fedora/nm-live-vm/run.sh b/contrib/fedora/nm-live-vm/run.sh index cd9f7c238a..809b3b59b1 100755 --- a/contrib/fedora/nm-live-vm/run.sh +++ b/contrib/fedora/nm-live-vm/run.sh @@ -39,5 +39,5 @@ else QEMU="qemu-system-$ARCH -enable-kvm" } - $QEMU -m $MEMORY -net nic $NET_OPTIONS -drive "file=fat:rw:$SDIR,cache=none" -kernel vmlinuz -append "video=1024x768 rootfstype=ramfs" -initrd initramfs.img + $QEMU -m $MEMORY -net nic $NET_OPTIONS -virtfs "local,path=$SDIR,mount_tag=host0,security_model=none,id=host0" -device "virtio-9p-pci,fsdev=host0,mount_tag=host0" -kernel vmlinuz -append "video=1024x768 rootfstype=ramfs" -initrd initramfs.img fi |