diff options
| author | Gabriele Giacone <1o5g4r8o@gmail.com> | 2014-07-26 15:58:42 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-07-27 03:07:03 +0200 |
| commit | 7ed16d79e12dc9ef4384f4f24420ca644c7be75c (patch) | |
| tree | 8656db7fab1ce72c281f42d1e9a3153a389ad7d9 /bin | |
| parent | 5fbdaa27bd7daf49e258ff586c5ee50de0ada055 (diff) | |
| download | jenkins.debian.net-7ed16d79e12dc9ef4384f4f24420ca644c7be75c.tar.xz | |
[hurd] ACPI poweroff is now working, remove workaround.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/g-i-installation.sh | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 6d73a389..b5104de8 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -422,14 +422,7 @@ post_install_boot() { ;; 0560) do_and_report key enter ;; - 0570) case $NAME in - *_hurd*) - do_and_report type "echo 'In tight loop: hit ctl-alt-del to reboot' >/dev/com0" - ;; - *) - do_and_report type "poweroff" - ;; - esac + 0570) do_and_report type "poweroff" ;; 0580) do_and_report key enter ;; @@ -961,18 +954,6 @@ monitor_system() { fi let NR=NR+1 sleep 2 - - # Hurd can't poweroff itself - 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." |