diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-04-24 15:11:55 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-04-24 15:11:55 +0200 |
| commit | 6f10dd77850939588a8c6a3902b010eb99aaf651 (patch) | |
| tree | d5d2caac246c37aac43cbe7dd9ae5ba4ffb581a8 /bin/g-i-installation.sh | |
| parent | 1be3055a0917564120528e94eaef0ac2ae9d6bcf (diff) | |
| download | jenkins.debian.net-6f10dd77850939588a8c6a3902b010eb99aaf651.tar.xz | |
g-i: properly test if this is a hurd test
Diffstat (limited to 'bin/g-i-installation.sh')
| -rwxr-xr-x | bin/g-i-installation.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 668572ae..dd25a765 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -886,13 +886,16 @@ monitor_system() { sleep 2 # Hurd can't poweroff itself - if [ -v QEMU_SERIAL_OUT ]; then - if grep "In tight loop: hit ctl-alt-del to reboot" $QEMU_SERIAL_OUT >/dev/null; then - echo "Powering off Hurd VM ..." - sleep 10 - sudo kill -9 $(ps fax | grep [q]emu-system | grep vnc=$DISPLAY 2>/dev/null | awk '{print $1}') - fi - fi + case $NAME in + *_hurd*) + if grep "In tight loop: hit ctl-alt-del to reboot" $QEMU_SERIAL_OUT >/dev/null; then + echo "Powering off Hurd VM ..." + sleep 10 + sudo kill -9 $(ps fax | grep [q]emu-system | grep vnc=$DISPLAY 2>/dev/null | awk '{print $1}') + fi + ;; + *) ;; + esac done if [ $NR -eq $MAX_RUNS ] ; then echo "Warning: running for ${hourlimit}h, forcing termination." |