Update copyright notice for 2015

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

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index a3ae03de4a6a54fec9d57efffda384ebea78de93..a90a3d4caf8bd532b938c2ed1bbf88f5f218938a 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
@@ -27,6 +27,7 @@ do_rcmd() {
        TIMEOUT="180"
        SSH_CHECKS="6"
        WAKE_DELAY="10s"
+       BOOT_DELAY="1m"
        SHUTDOWN_TIME="+10"
 
        . "$cnf"
@@ -72,16 +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."
@@ -91,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 $SHUTDOWN_TIME" >/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