--- a/kvmtool.sh	Thu Jul 15 10:05:50 2010 +0200
+++ b/kvmtool.sh	Tue Aug 16 14:00:23 2011 +0200
@@ -6,11 +6,13 @@
 ME=${0##*/}
 NODE=$(uname -n)
 KVMTAB=/etc/kvmtab
-KVM_OPTS_BUILTIN='-drive file=/dev/drbd$ID,if=virtio,index=0,boot=on
+KVM_OPTS_BUILTIN='
+        -vnc 127.0.0.1:$ID
+        -drive file=/dev/drbd$ID,if=virtio,index=0,boot=on
 	-boot c
 	-m 512
 	-net nic,macaddr=$MAC,model=virtio
-	-net tap,ifname=tap$ID,script=no' 
+	-net tap,ifname=tap$ID,script=no'
 
 function die() { echo $0: "$@" >&2; exit 1; }
 
@@ -50,7 +52,7 @@
 		echo "using builtin config"
 		KVM_OPTS=$KVM_OPTS_BUILTIN
 	    fi
-	    eval KVM_OPTS=\"-name $NAME -vnc :$ID $KVM_OPTS -monitor tcp:127.0.0.1:$MONITOR,server,nowait\"
+	    eval KVM_OPTS=\"-name $NAME $KVM_OPTS -monitor tcp:127.0.0.1:$MONITOR,server,nowait\"
 	    drbdadm primary drbd$ID
 	    tunctl -u kvm-$NAME -t tap$ID
 	    brctl delif br0 tap$ID &> /dev/null || true