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

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index c21a21f..0ec4bec 100755
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # trigger-rcmp: Trigger remote commands
-# Copyright (c)2014 Alexander Barton (alex@barton.de)
+# Copyright (c)2014-2015 Alexander Barton (alex@barton.de)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ RCMD_D="/usr/local/etc/rcmd.d"
 PATH="$PATH:/usr/local/sbin:/usr/sbin"
 
 do_help() {
-	echo "Usage: $0 <rcmd> [<rcmd> [...]]" >&2
+	echo "Usage: $0 [--no-wake|-n] <rcmd> [<rcmd> [...]]" >&2
 	exit 2
 }
 
@@ -24,8 +24,11 @@ do_rcmd() {
 	SYSTEM="localhost"
 	IFACE="eth0"
 	CMD="uptime"
-	TIMEOUT="180"
+	TIMEOUT="300"
 	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"
+			ssh -q "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/dev/null
 			if [ $? -ne 0 ]; then
 				echo "$NAME: failed to power off \"$SYSTEM\"!" >&2
 				return 5
@@ -108,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)