diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2011-02-11 17:00:08 -0500 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2011-02-11 17:00:08 -0500 |
| commit | 8ee6019cce14fef6ddc64f9b22281ed43b6491bf (patch) | |
| tree | 5aa58fe6cbcfd1e6b09a41187b57aed4406366a6 | |
| parent | 6f2c0743fc8bc693e60873da21e42382e54bcbda (diff) | |
| download | kvm-manager-8ee6019cce14fef6ddc64f9b22281ed43b6491bf.tar.gz kvm-manager-8ee6019cce14fef6ddc64f9b22281ed43b6491bf.tar.bz2 | |
switch client/server for the console back the other way: avoids lag, enables restarting a screen if one of them dies for some reason.
| -rwxr-xr-x | kvm-manager | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kvm-manager b/kvm-manager index 6250fe1..d7b74e6 100755 --- 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" & |