Test for required external commands

[trigger-rcmd.git] / scripts / trigger-rcmd

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index c8f92ba68fc987a456a0f2bb9892d251222cade9..17fd8a345b2973c75f2c073f13a1bac9ed52e71e 100755 (executable)
--- 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,9 +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"
 
@@ -71,15 +73,21 @@ do_rcmd() {
 
        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
+               ssh -q -o "ServerAliveInterval 120" "$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\"."
+
+       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=$?
+       ssh -q  -o "ServerAliveInterval 120" "$SYSTEM" "$CMD" </dev/null ; r=$?
 
        echo
        echo "$NAME: remote command ended with return code $r."
@@ -89,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  -o "ServerAliveInterval 120" "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/dev/null
                        if [ $? -ne 0 ]; then
                                echo "$NAME: failed to power off \"$SYSTEM\"!" >&2
                                return 5
@@ -109,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)