switch client/server for the console back the other way: avoids lag, enables restarti...

diff --git a/kvm-manager b/kvm-manager
index 6250fe1a9ee8e211e91e74cb9a8f1bbeb05f83d6..d7b74e6602e33de832f539f08f962334c1e17b3b 100755 (executable)
--- a/kvm-manager
+++ b/kvm-manager
@@ -69,10 +69,7 @@ EOF
     }
 
     chpst -u "$OWNER:$OWNERGROUP" \
-        /usr/bin/screen -D -m -L -c /etc/screenrc.kvm-manager -S "$VMNAME" -t "$VMNAME" socat STDIO,raw,echo=0 "UNIX-LISTEN:${CONSOLENAME}" &
-
-    # HACKERY: give a pause for the socket to get set up: 
-    sleep 2
+        /usr/bin/screen -D -m -L -c /etc/screenrc.kvm-manager -S "$VMNAME" -t "$VMNAME" socat STDIO,raw,echo=0 "UNIX:${CONSOLENAME},retry=30" &
 
     chpst -u "$OWNER:$OWNERGROUP:kvm" \
         /usr/bin/kvm $KVMARGS \
@@ -87,7 +84,7 @@ EOF
         -rtc base=utc \
         -usb \
         -device virtio-balloon-pci,id=balloon0,bus=pci.0 \
-        -chardev "socket,id=serial0,path=$CONSOLENAME,nowait" -device isa-serial,chardev=serial0 \
+        -chardev "socket,id=serial0,path=$CONSOLENAME,server,nowait" -device isa-serial,chardev=serial0 \
         -smp "${SMP:-1},maxcpus=${MAXCPUS:-8}" \
         -device "virtio-net-pci,vlan=0,id=net0,mac=$MAC,bus=pci.0" \
         -net "tap,ifname=$TAP,script=no,downscript=no,vlan=0,name=hostnet0" &