Tollef release some d.o metapackages with a -46 versionnumber, skip that one

[dsa-metapackages.git] / buildd-reboot

diff --git a/buildd-reboot b/buildd-reboot
index c454a400b69fe31fc6799c313e245d96ee3b7a5c..3ba1f045b6a8b43216574ab237c8a8f094b18c8a 100755 (executable)
--- a/buildd-reboot
+++ b/buildd-reboot
@@ -79,10 +79,13 @@ buildd_wait_and_reboot() {
                echo
        fi
 
+       if grep 'waiting-for-clean-shutdown' ~buildd/NO-DAEMON-PLEASE > /dev/null; then
+               sudo -u buildd sh -c 'echo delete-on-boot > ~buildd/NO-DAEMON-PLEASE'
+       fi
        if [ "$halt" = 1 ]; then
-               /sbin/shutdown -h 15 "$reason"
+               /sbin/shutdown -h 1 "$reason"
        else
-               /sbin/shutdown -r 15 "$reason"
+               /sbin/shutdown -r 1 "$reason"
        fi
 }
 
@@ -100,13 +103,21 @@ if ! [ -d ~buildd ]; then
 fi
 
 if ! test -e ~buildd/NO-DAEMON-PLEASE; then
-       echo "Touching ~buildd/NO-DAEMON-PLEASE ~buildd/EXIT-DAEMON-PLEASE"
-       sudo -u buildd touch ~buildd/NO-DAEMON-PLEASE ~buildd/EXIT-DAEMON-PLEASE
-       sudo -u buildd sh -c 'echo delete-on-boot > ~buildd/NO-DAEMON-PLEASE'
-       sudo chgrp -v adm ~buildd/NO-DAEMON-PLEASE
-
-       echo "Sending HUP to buildd"
-       sudo -u buildd kill -HUP `sudo cat ~buildd/build/buildd.pid`
+       if [ -e ~buildd/build/buildd.pid ] ; then
+               echo "Touching ~buildd/NO-DAEMON-PLEASE ~buildd/EXIT-DAEMON-PLEASE"
+               sudo -u buildd touch ~buildd/NO-DAEMON-PLEASE ~buildd/EXIT-DAEMON-PLEASE
+               sudo -u buildd sh -c 'echo waiting-for-clean-shutdown > ~buildd/NO-DAEMON-PLEASE'
+               sudo chgrp -v adm ~buildd/NO-DAEMON-PLEASE
+
+               echo "Sending HUP to buildd"
+               sudo -u buildd kill -HUP `sudo cat ~buildd/build/buildd.pid`
+       else
+               echo "no-daemon-please does not exist, but there is no buildd.pid file either"
+               if pgrep -u buildd -x buildd ; then
+                       echo "But there is a buildd running.  Bad?"
+                       exit 3
+               fi
+       fi
 else
        echo "no-daemon-please already exists"
 fi