X-Git-Url: https://arthur.barton.de/gitweb/?p=trigger-rcmd.git;a=blobdiff_plain;f=scripts%2Ftrigger-rcmd;h=9c23ae06e227c797d19c6a2930099051a3ff8d87;hp=b0c1aa9b2d3e4d2ea4dd299e61bbd8fd068d88bd;hb=f7a5ad44115947ea09b840d1df2cdb2c9bcf575a;hpb=4e8a723d41a8d3fb36f681be09542521f87a70a5

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index b0c1aa9..9c23ae0 100755
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -26,6 +26,9 @@ do_rcmd() {
 	CMD="uptime"
 	TIMEOUT="180"
 	SSH_CHECKS="6"
+	WAKE_DELAY="10s"
+	BOOT_DELAY="1m"
+	SHUTDOWN_TIME="+10"
 
 	. "$cnf"
 
@@ -61,7 +64,7 @@ do_rcmd() {
 			echo "$NAME: failed to wake \"$SYSTEM\"!" >&2
 			return 4
 		fi
-		sleep 3
+		sleep "$WAKE_DELAY"
 		rsys_was_running=0
 	else
 		echo "$NAME: \"$SYSTEM\" is already alive, ok."
@@ -74,6 +77,12 @@ do_rcmd() {
 		echo "$NAME: SSH on \"$SYSTEM\" not ready. Waiting ..."
 		sleep 10s
 	done
+	echo "$NAME: ok, SSH seems to be available on \"$SYSTEM\"."
+
+	if [ "$rsys_was_running" -eq 0 ]; then
+		echo "$NAME: \"$SYSTEM\" just started up. Delaying actions for $BOOT_DELAY ..."
+		sleep "$BOOT_DELAY"
+	fi
 
 	echo "$NAME: calling \"$CMD\" on \"$SYSTEM\" ..."
 	echo
@@ -88,7 +97,7 @@ do_rcmd() {
 		rsys_users=`ssh -q "$SYSTEM" w | tail -n +3 | wc -l`
 		if [ "$rsys_users" = "0" ]; then
 			echo "$NAME: power off \"$SYSTEM\" again ..."
-			ssh -q "$SYSTEM" "sync; shutdown -hP +1" >/dev/null
+			ssh -q "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/dev/null
 			if [ $? -ne 0 ]; then
 				echo "$NAME: failed to power off \"$SYSTEM\"!" >&2
 				return 5