summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael G. Martins <rafael@rafaelmartins.eng.br>2013-11-16 00:36:20 -0200
committerRafael G. Martins <rafael@rafaelmartins.eng.br>2013-11-16 00:36:20 -0200
commitb2e940c4023f5a92bf59d2a14137106b816dec95 (patch)
tree28a9cf1b9f3ba311c734dd987c93e8be7b943822 /app-emulation/qemu-init-scripts
parents,/var/run,/run/g (diff)
downloadkvm-tools-b2e940c4023f5a92bf59d2a14137106b816dec95.tar.gz
kvm-tools-b2e940c4023f5a92bf59d2a14137106b816dec95.tar.bz2
kvm-tools-b2e940c4023f5a92bf59d2a14137106b816dec95.zip
fix FOREGROUND=vnc usage
Diffstat (limited to 'app-emulation/qemu-init-scripts')
-rw-r--r--app-emulation/qemu-init-scripts/files/qemu-conf.example2
-rw-r--r--app-emulation/qemu-init-scripts/files/qemu-init-script4
2 files changed, 3 insertions, 3 deletions
diff --git a/app-emulation/qemu-init-scripts/files/qemu-conf.example b/app-emulation/qemu-init-scripts/files/qemu-conf.example
index 46f8274..edee67c 100644
--- a/app-emulation/qemu-init-scripts/files/qemu-conf.example
+++ b/app-emulation/qemu-init-scripts/files/qemu-conf.example
@@ -3,7 +3,7 @@ MACADDR=52:54:1C:10:34:35
DISKIMAGE=/mnt/kvm/gentoo64.qcow2
MEMORY=1G
SMP=4
-VNC=:24
+FOREGROUND="vnc=:24"
NIC_MODEL=virtio
DRIVE_MODEL=virtio
#OTHER_ARGS="-boot order=dc -cdrom /mnt/archive/gentoo/install-amd64-minimal-20100408.iso"
diff --git a/app-emulation/qemu-init-scripts/files/qemu-init-script b/app-emulation/qemu-init-scripts/files/qemu-init-script
index 4bc8bc0..e8ca078 100644
--- a/app-emulation/qemu-init-scripts/files/qemu-init-script
+++ b/app-emulation/qemu-init-scripts/files/qemu-init-script
@@ -36,12 +36,12 @@ discern_vm_binary() {
discern_foreground() {
if [ -n "$VNC" ]; then
- ewarn "VNC option is going away; set FOREGROUND=vnc${VNC} instead"
+ ewarn "VNC option is going away; set FOREGROUND=\"vnc=${VNC}\" instead"
FOREGROUND="vnc=${VNC}"
fi
case "${FOREGROUND:-none}" in
vnc*)
- VNC=${VNC#*=}
+ VNC=${FOREGROUND#*=}
if [ -z "$VNC" ]; then
eerror "FOREGROUND vnc is incorrectly set; must specify an address (:1 for example)"
return 1