SSH: Don't set "ServerAliveInterval" option explicitely

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

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index a3ae03de4a6a54fec9d57efffda384ebea78de93..0ec4bec33b7f0b030af12728d3157a0b3829eb2f 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,10 @@ 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"
@@ -78,6 +79,11 @@ do_rcmd() {
        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
 
@@ -111,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)