Don't indicate error for "no wake" systems

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

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index cfd4d790df7c531e9fca9d6482f3cda984a9fa4e..ec70d958f2864ae3c42912115fbbccb615d3bb4f 100755 (executable)
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # trigger-rcmp: Trigger remote commands
-# Copyright (c)2014-2016 Alexander Barton (alex@barton.de)
+# Copyright (c)2014-2017 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
@@ -10,7 +10,8 @@
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 
-NAME=$(basename "$0")
+BASENAME=$(basename "$0")
+NAME="$BASENAME"
 RCMD_D="/usr/local/etc/rcmd.d"
 
 PATH="$PATH:/usr/local/sbin:/usr/sbin"
@@ -39,8 +40,6 @@ do_rcmd() {
                return 2
        fi
 
-       NAME="$NAME($1)"
-
        echo "$NAME: Checking system \"$SYSTEM\" ..."
        fping -c1 -q "$SYSTEM" 2>/dev/null
        if [ $? -ne 0 ]; then
@@ -153,6 +152,7 @@ while [ $# -gt 0 ]; do
                r=1
        else
                echo "$NAME: Working on \"$1\" - $(date "+%Y-%m-%d %H:%M:%S")"
+               NAME="$BASENAME($1)"
                lck="/run/lock/$NAME-$1.lock"
                if lockfile-create --quiet --use-pid --retry 2 --lock-name "$lck"; then
                        do_rcmd "$1" ; r=$?
@@ -162,8 +162,14 @@ while [ $# -gt 0 ]; do
                        echo "$NAME: Failed to acquire lock file, skipping job! ($lck)"
                        r=1
                fi
+               NAME=$BASENAME
+       fi
+       if [ $r -ne 0 ]; then
+               # Exit code indicates an error. But only flag this as error
+               # when target should have been woken up and the indicated error
+               # is not "system down" (9).
+               [ -z "$NO_WAKE" ] || [ $r -ne 9 ] && result=1
        fi
-       [ $r -ne 0 ] && result=1
        shift
        [ $# -gt 0 ] && echo
 done