From b2e940c4023f5a92bf59d2a14137106b816dec95 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Sat, 16 Nov 2013 00:36:20 -0200 Subject: fix FOREGROUND=vnc usage --- app-emulation/qemu-init-scripts/files/qemu-conf.example | 2 +- app-emulation/qemu-init-scripts/files/qemu-init-script | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app-emulation/qemu-init-scripts') 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 -- cgit v1.2.3-18-g5258