From 6f10dd77850939588a8c6a3902b010eb99aaf651 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 24 Apr 2014 15:11:55 +0200 Subject: g-i: properly test if this is a hurd test --- bin/g-i-installation.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'bin') 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." -- cgit v1.2.3-70-g09d2