diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-05-21 14:40:31 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-05-21 14:40:31 -0400 |
| commit | 9a5037f1e1ffcde13c28d366e05f3c327e566386 (patch) | |
| tree | 1e72f760ab9dadc0d958a751ee9405ea2adc123a | |
| parent | 4e73aa0a0927c4a759cace2cf75a350b38aa93a4 (diff) | |
| download | kvm-manager-9a5037f1e1ffcde13c28d366e05f3c327e566386.tar.gz kvm-manager-9a5037f1e1ffcde13c28d366e05f3c327e566386.tar.bz2 | |
invoke screen correctly across an API break.
See https://bugs.debian.org/863095 about the need for this change.
note that the argument to -L duplicates the "logfile" entry in
screenrc.kvm-manager.
| -rwxr-xr-x | kvm-manager | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kvm-manager b/kvm-manager index 0e15c09..c4bfccb 100755 --- a/kvm-manager +++ b/kvm-manager @@ -52,6 +52,7 @@ OWNERGROUP=$(groups "$OWNER" | cut -f1 -d\ ) OWNERHOME=$(getent passwd "$OWNER" | cut -f6 -d: ) kvm_version=$(kvm --version | head -n1 | sed -E 's/^QEMU emulator version ([0-9.]+).*/\1/') +screen_version=$(screen --version | head -n1 | sed -E 's/^Screen version ([0-9.]+).*/\1/') # Disks can be HDA, HDB, HDC, etc. For each disk, we want to detect the # corresponding environment variables for disk read/write restrictions @@ -184,8 +185,13 @@ EOF -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" & + local screen_log_args=-L + if dpkg --compare-versions "$screen_version" ge 4.05; then + screen_log_args="-L ./servicelog" + fi + chpst -u "$OWNER:$OWNERGROUP" \ - /usr/bin/screen -D -m -L ./servicelog -c /etc/screenrc.kvm-manager -S "$VMNAME" -t "$VMNAME" socat STDIO,raw,echo=0 "UNIX:${CONSOLENAME},retry=30" & + /usr/bin/screen -D -m $screen_log_args -c /etc/screenrc.kvm-manager -S "$VMNAME" -t "$VMNAME" socat STDIO,raw,echo=0 "UNIX:${CONSOLENAME},retry=30" & set +e # handle regular signals |