X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=trigger-rcmd.git;a=blobdiff_plain;f=scripts%2Ftrigger-rcmd;h=0ec4bec33b7f0b030af12728d3157a0b3829eb2f;hp=06b688e68c870046bb583a13d07351de9cd5d847;hb=160d43e87ff6efa7601d691416d69a3808b179db;hpb=cddbb32c0253d8105915e4e2c5e1a168543a1d2c

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index 06b688e..0ec4bec 100755
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -24,7 +24,7 @@ do_rcmd() {
 	SYSTEM="localhost"
 	IFACE="eth0"
 	CMD="uptime"
-	TIMEOUT="180"
+	TIMEOUT="300"
 	SSH_CHECKS="6"
 	WAKE_DELAY="10s"
 	BOOT_DELAY="1m"
@@ -73,7 +73,7 @@ do_rcmd() {
 
 	for i in `seq 1 $SSH_CHECKS`; do
 		echo "$NAME: checking SSH connection ($i/$SSH_CHECKS) ..."
-		ssh -q -o "ServerAliveInterval 120" "$SYSTEM" true >/dev/null 2>&1 && break
+		ssh -q "$SYSTEM" true >/dev/null 2>&1 && break
 		echo "$NAME: SSH on \"$SYSTEM\" not ready. Waiting ..."
 		sleep 10s
 	done
@@ -87,7 +87,7 @@ do_rcmd() {
 	echo "$NAME: calling \"$CMD\" on \"$SYSTEM\" ..."
 	echo
 
-	ssh -q  -o "ServerAliveInterval 120" "$SYSTEM" "$CMD" </dev/null ; r=$?
+	ssh -q "$SYSTEM" "$CMD" </dev/null ; r=$?
 
 	echo
 	echo "$NAME: remote command ended with return code $r."
@@ -97,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  -o "ServerAliveInterval 120" "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/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
@@ -117,6 +117,15 @@ do_rcmd() {
 # Defaults
 NO_WAKE=
 
+# Check required tools
+for t in fping ssh etherwake; do
+	type "$t" >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "$NAME: Required tool \"$t\" missing, aborting!"
+		exit 3
+	fi
+done
+
 while [ $# -gt 0 ]; do
 	case "$1" in
 	  --no-wake|-n)