| 1 |
commit: 471f96ec4b93b9b303e2b7c7eee388c8a0e8ab72 |
| 2 |
Author: Brian Harring <ferringb <AT> chromium <DOT> org> |
| 3 |
AuthorDate: Sat Apr 14 21:02:22 2012 +0000 |
| 4 |
Commit: Brian Harring <ferringb <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 14 23:47:58 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kvm-tools.git;a=commit;h=471f96ec |
| 7 |
|
| 8 |
Protect against ',' in DISKIMAGE pathways. |
| 9 |
|
| 10 |
--- |
| 11 |
.../qemu-init-scripts/files/qemu-init-script | 2 +- |
| 12 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-emulation/qemu-init-scripts/files/qemu-init-script b/app-emulation/qemu-init-scripts/files/qemu-init-script |
| 15 |
index 23b12ef..a42e866 100644 |
| 16 |
--- a/app-emulation/qemu-init-scripts/files/qemu-init-script |
| 17 |
+++ b/app-emulation/qemu-init-scripts/files/qemu-init-script |
| 18 |
@@ -112,7 +112,7 @@ start() { |
| 19 |
--pidfile ${PIDFILE} \ |
| 20 |
-- -daemonize -pidfile ${PIDFILE} -monitor unix:${MONITOR},server,nowait \ |
| 21 |
-runas ${DROP_USER} -name ${VMNAME} \ |
| 22 |
- -drive file="$DISKIMAGE",if=${DRIVE_MODEL:-virtio},cache=${DRIVE_CACHE:-none} \ |
| 23 |
+ -drive file="${DISKIMAGE//,/,,}",if=${DRIVE_MODEL:-virtio},cache=${DRIVE_CACHE:-none} \ |
| 24 |
"${NIC_COMMAND[@]}" \ |
| 25 |
${DISABLE_KVM:---enable-kvm} \ |
| 26 |
${MEMORY:+-m ${MEMORY}} ${SMP:+-smp ${SMP}} ${VNC:+-vnc ${VNC}} ${OTHER_ARGS} |
Archives