X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=buildd-reboot;h=d77667dfa1c627de2dd99ec05907820f9977b077;hb=9becd0d8ebfdd8d3c1ec6ebf8ceb546d93692bf6;hp=237fb8b8b0e38304872e629501a532f121ae295a;hpb=f0d5b2ab28621ea2f853cbd97942e326fcb1670a;p=dsa-metapackages.git

diff --git a/buildd-reboot b/buildd-reboot
index 237fb8b..d77667d 100755
--- a/buildd-reboot
+++ b/buildd-reboot
@@ -44,6 +44,30 @@ if [ "$#" != 1 ]; then
 fi
 reason="$1"
 
+touch_stuff() {
+	local user="$1"
+	local home=$(getent passwd "$user" | awk -F: '{print $6}')
+
+	if ! test -e "$home"/NO-DAEMON-PLEASE; then
+		if [ -e "$home"/build/buildd.pid ] ; then
+			echo "Touching ${home}/NO-DAEMON-PLEASE ${home}/EXIT-DAEMON-PLEASE"
+			sudo -u "$user" touch "$home"/NO-DAEMON-PLEASE "$home"/EXIT-DAEMON-PLEASE
+			sudo -u "$user" sh -c "echo waiting-for-clean-shutdown > '${home}/'NO-DAEMON-PLEASE"
+			sudo chgrp -v adm "$home"/NO-DAEMON-PLEASE
+
+			echo "Sending HUP to $user:buildd"
+			sudo -u "$user" kill -HUP "$(sudo cat "${home}"/build/buildd.pid)"
+		else
+			echo "$user: no-daemon-please does not exist, but there is no buildd.pid file either"
+			if pgrep -u "$user" -x buildd ; then
+				echo "But there is a buildd running.  Bad?"
+				exit 3
+			fi
+		fi
+	else
+		echo "no-daemon-please already exists"
+	fi
+}
 
 
 wall_counter=0
@@ -62,14 +86,14 @@ maybe_wall() {
 buildd_wait_and_reboot() {
 	echo -n "Waiting for buildd to shut down"
 
-	while test -e ~buildd/build/buildd.pid ; do
+	while test -e ~buildd/build/buildd.pid  ||  test -e ~buildd2/build/buildd.pid; do
 		echo -n "."
 		sleep 5
 		maybe_wall
 	done
 	echo
 
-	if pgrep -u buildd -x buildd ; then
+	if pgrep -u buildd -x buildd || pgrep -u buildd2 - x buildd; then
 		echo "pidfile is gone, but buildd process still runs"
 		while pgrep -u buildd -x buildd ; do
 			echo -n "."
@@ -79,10 +103,16 @@ 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 grep 'waiting-for-clean-shutdown' ~buildd2/NO-DAEMON-PLEASE > /dev/null; then
+		sudo -u buildd2 sh -c 'echo delete-on-boot > ~buildd2/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
 }
 
@@ -99,20 +129,7 @@ if ! [ -d ~buildd ]; then
 	exit 3
 fi
 
-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 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"
-	fi
-else
-	echo "no-daemon-please already exists"
-fi
+touch_stuff buildd
+[ -d ~buildd2 ] && touch_stuff buildd2
 
 buildd_wait_and_reboot