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

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index 7db861f..b0c1aa9 100755
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -25,6 +25,7 @@ do_rcmd() {
 	IFACE="eth0"
 	CMD="uptime"
 	TIMEOUT="180"
+	SSH_CHECKS="6"
 
 	. "$cnf"
 
@@ -38,6 +39,11 @@ do_rcmd() {
 	echo "$NAME: checking system \"$SYSTEM\" ..."
 	fping -c1 -q "$SYSTEM" 2>/dev/null
 	if [ $? -ne 0 ]; then
+		if [ -n "$NO_WAKE" ]; then
+			echo "$NAME: \"$SYSTEM\" seems to be down, skipping job."
+			return 9
+		fi
+
 		echo "$NAME: \"$SYSTEM\" seems to be down, wake it up ..."
 		etherwake -b -i "$IFACE" `echo "$SYSTEM" | cut -d'.' -f1`
 		if [ $? -ne 0 ]; then
@@ -62,6 +68,13 @@ do_rcmd() {
 		rsys_was_running=1
 	fi
 
+	for i in `seq 1 $SSH_CHECKS`; do
+		echo "$NAME: checking SSH connection ($i/$SSH_CHECKS) ..."
+		ssh -q "$SYSTEM" true >/dev/null 2>&1 && break
+		echo "$NAME: SSH on \"$SYSTEM\" not ready. Waiting ..."
+		sleep 10s
+	done
+
 	echo "$NAME: calling \"$CMD\" on \"$SYSTEM\" ..."
 	echo
 
@@ -75,7 +88,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"
+			ssh -q "$SYSTEM" "sync; shutdown -hP +1" >/dev/null
 			if [ $? -ne 0 ]; then
 				echo "$NAME: failed to power off \"$SYSTEM\"!" >&2
 				return 5
@@ -92,8 +105,13 @@ do_rcmd() {
 	[ $r -eq 0 ] && return 0 || return 1
 }
 
+# Defaults
+NO_WAKE=
+
 while [ $# -gt 0 ]; do
 	case "$1" in
+	  --no-wake|-n)
+		NO_WAKE=1; ;;
 	  --help|-*)
 		do_help; ;;
 	  *)