From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 26 Oct 2009 08:39:40 +0000 (+0100)
Subject: buildd-reboot: Write 'delete-on-reboot' to no-daemon-please only when the buildd... 
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=commitdiff_plain;h=18fb45ae1dcf60d7dd129ea6da5a9e0b3686c836;ds=sidebyside

buildd-reboot: Write 'delete-on-reboot' to no-daemon-please only when the buildd has stopped cleanly.  Write waiting-for-clean-shutdown while we are waiting.
---

diff --git a/buildd-reboot b/buildd-reboot
index 237fb8b..dc45094 100755
--- a/buildd-reboot
+++ b/buildd-reboot
@@ -79,6 +79,9 @@ 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"
 	else
@@ -103,13 +106,17 @@ if ! test -e ~buildd/NO-DAEMON-PLEASE; then
 	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 delete-on-boot > ~buildd/NO-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"
diff --git a/debian/changelog b/debian/changelog
index 461b973..8f50be8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian.org (28) stable; urgency=low
+
+  * buildd-reboot: Write 'delete-on-reboot' to no-daemon-please only
+    when the buildd has stopped cleanly.  Write
+    waiting-for-clean-shutdown while we are waiting.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 26 Oct 2009 09:38:46 +0100
+
 debian.org (27) stable; urgency=low
 
   * buildd-reboot: Only touch no-daemon-please if there is currently a