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

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index b0c1aa9..ae709d5 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,19 +24,22 @@ 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"
 
 	if [ $? -ne 0 ]; then
-		echo "$NAME: failed to read \"$cnf\"!"
+		echo "$NAME: Failed to read \"$cnf\"!"
 		return 2
 	fi
 
 	NAME="$NAME($1)"
 
-	echo "$NAME: checking system \"$SYSTEM\" ..."
+	echo "$NAME: Checking system \"$SYSTEM\" ..."
 	fping -c1 -q "$SYSTEM" 2>/dev/null
 	if [ $? -ne 0 ]; then
 		if [ -n "$NO_WAKE" ]; then
@@ -47,10 +50,10 @@ do_rcmd() {
 		echo "$NAME: \"$SYSTEM\" seems to be down, wake it up ..."
 		etherwake -b -i "$IFACE" `echo "$SYSTEM" | cut -d'.' -f1`
 		if [ $? -ne 0 ]; then
-			echo "$NAME: failed to wake \"$SYSTEM\"!" >&2
+			echo "$NAME: Failed to wake \"$SYSTEM\"!" >&2
 			return 3
 		fi
-		echo "$NAME: waiting for \"$SYSTEM\" to respond ..."
+		echo "$NAME: Waiting for \"$SYSTEM\" to respond ..."
 		for i in `seq 1 $TIMEOUT`; do
 			fping -c1 -q "$SYSTEM" 2>/dev/null
 			[ $? -ne 0 ] || break
@@ -58,10 +61,10 @@ do_rcmd() {
 		done
 		fping -c1 -q "$SYSTEM" 2>/dev/null
 		if [ $? -ne 0 ]; then
-			echo "$NAME: failed to wake \"$SYSTEM\"!" >&2
+			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."
@@ -69,35 +72,41 @@ do_rcmd() {
 	fi
 
 	for i in `seq 1 $SSH_CHECKS`; do
-		echo "$NAME: checking SSH connection ($i/$SSH_CHECKS) ..."
+		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: Ok, SSH seems to be available on \"$SYSTEM\"."
 
-	echo "$NAME: calling \"$CMD\" 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
 
 	ssh -q "$SYSTEM" "$CMD" </dev/null ; r=$?
 
 	echo
-	echo "$NAME: remote command ended with return code $r."
+	echo "$NAME: Remote command ended with return code $r."
 	sleep 2
 
 	if [ "$rsys_was_running" -eq 0 ]; then
 		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
+			echo "$NAME: Power off \"$SYSTEM\" again ..."
+			ssh -q "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/dev/null
 			if [ $? -ne 0 ]; then
-				echo "$NAME: failed to power off \"$SYSTEM\"!" >&2
+				echo "$NAME: Failed to power off \"$SYSTEM\"!" >&2
 				return 5
 			fi
 		else
-			echo "$NAME: not shutting down \"$SYSTEM\", \c"
+			echo "$NAME: Not shutting down \"$SYSTEM\", \c"
 			[ $rsys_users -eq 1 ] \
-				&& echo "there is 1 user logged in!" \
-				|| echo "there are $rsys_users users logged in!"
+				&& echo "There is 1 user logged in!" \
+				|| echo "There are $rsys_users users logged in!"
 		fi
 	else
 		echo "$NAME: \"$SYSTEM\" was already alive, not shutting down."
@@ -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)
@@ -126,12 +144,12 @@ result=0
 while [ $# -gt 0 ]; do
 	cnf="$RCMD_D/$1"
 	if [ ! -r "$cnf" ]; then
-		echo "$NAME: can't read \"$cnf\"!"
+		echo "$NAME: Can't read \"$cnf\"!"
 		r=1
 	else
-		echo "$NAME: working on \"$1\" - `date "+%Y-%m-%d %H:%M:%S"`"
+		echo "$NAME: Working on \"$1\" - `date "+%Y-%m-%d %H:%M:%S"`"
 		do_rcmd "$1" ; r=$?
-		echo "$NAME: done ($r) - `date "+%Y-%m-%d %H:%M:%S"`"
+		echo "$NAME: Done ($r) - `date "+%Y-%m-%d %H:%M:%S"`"
 	fi
 	[ $r -ne 0 ] && result=1
 	shift