X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=buildd-reboot;h=3ba1f045b6a8b43216574ab237c8a8f094b18c8a;hp=d082ef28366957043f9eb91ed8c7f2ddcc3915bb;hb=d8fc620a5038cf7489d126f0538e4f8c5ad19472;hpb=205d6d70eb332f0e2070abff5750b7ea34ad4795

diff --git a/buildd-reboot b/buildd-reboot
index d082ef2..3ba1f04 100755
--- a/buildd-reboot
+++ b/buildd-reboot
@@ -50,7 +50,7 @@ wall_counter=0
 maybe_wall() {
 	wall_counter=$((wall_counter-1))
 	if [ "$wall_counter" -le 0 ]; then
-		if [ "$host" = 1 ]; then
+		if [ "$halt" = 1 ]; then
 			echo "System will halt for $reason when buildd has stopped" | wall
 		else
 			echo "System will reboot for $reason when buildd has stopped" | wall
@@ -79,10 +79,13 @@ buildd_wait_and_reboot() {
 		echo
 	fi
 
-	if [ "$host" = 1 ]; then
-		/sbin/shutdown -p 15 "$reason"
+	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 1 "$reason"
 	else
-		/sbin/shutdown -p 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