X-Git-Url: https://arthur.barton.de/gitweb/?p=trigger-rcmd.git;a=blobdiff_plain;f=scripts%2Ftrigger-rcmd;h=5d96d7fae9aab9bb9585bc7ac576dcd6adfbd76a;hp=d1d13f35d1fc8e30dcc0b8f1a92937580184e54e;hb=07a3ebeaa814fccf08bb691e75bb70b9c578ed0a;hpb=c848e77b98accf0d836bf00555ff7e82cb9fde47

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index d1d13f3..5d96d7f 100755
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # trigger-rcmp: Trigger remote commands
-# Copyright (c)2014-2015 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"
@@ -30,6 +31,8 @@ do_rcmd() {
 	BOOT_DELAY="1m"
 	SHUTDOWN_TIME="+10"
 
+	# Read in job/configuration file, but ignore shellcheck(1) warnings:
+	# shellcheck disable=1090
 	. "$cnf"
 
 	if [ $? -ne 0 ]; then
@@ -37,8 +40,6 @@ do_rcmd() {
 		return 2
 	fi
 
-	local NAME="$NAME($1)"
-
 	echo "$NAME: Checking system \"$SYSTEM\" ..."
 	fping -c1 -q "$SYSTEM" 2>/dev/null
 	if [ $? -ne 0 ]; then
@@ -48,13 +49,13 @@ do_rcmd() {
 		fi
 
 		echo "$NAME: \"$SYSTEM\" seems to be down, wake it up ..."
-		etherwake -b -i "$IFACE" `echo "$SYSTEM" | cut -d'.' -f1`
+		etherwake -b -i "$IFACE" "$(echo "$SYSTEM" | cut -d'.' -f1)"
 		if [ $? -ne 0 ]; then
 			echo "$NAME: Failed to wake \"$SYSTEM\"!" >&2
 			return 3
 		fi
 		echo "$NAME: Waiting for \"$SYSTEM\" to respond ..."
-		for i in `seq 1 $TIMEOUT`; do
+		for i in $(seq 1 $TIMEOUT); do
 			fping -c1 -q "$SYSTEM" 2>/dev/null
 			[ $? -ne 0 ] || break
 			sleep 1s
@@ -71,13 +72,15 @@ do_rcmd() {
 		rsys_was_running=1
 	fi
 
-	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
+	for i in $(seq 1 $SSH_CHECKS); do
+		echo "$NAME: Checking SSH connection [publickey] ($i/$SSH_CHECKS) ..."
+		if ssh -o PreferredAuthentications=publickey -q "$SYSTEM" true >/dev/null 2>&1; then
+			echo "$NAME: Ok, SSH seems to be available on \"$SYSTEM\"."
+			break
+		fi
 		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 ..."
@@ -87,24 +90,26 @@ do_rcmd() {
 	echo "$NAME: Calling \"$CMD\" on \"$SYSTEM\" ..."
 	echo
 
-	ssh -q "$SYSTEM" "$CMD" </dev/null ; r=$?
+	# shellcheck disable=2029
+	ssh -o PreferredAuthentications=publickey -q "$SYSTEM" "$CMD" </dev/null ; r=$?
 
 	echo
 	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`
+		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
+			# shellcheck disable=2029
+			ssh -o PreferredAuthentications=publickey -q "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/dev/null
 			if [ $? -ne 0 ]; then
 				echo "$NAME: Failed to power off \"$SYSTEM\"!" >&2
 				return 5
 			fi
 		else
 			echo "$NAME: Not shutting down \"$SYSTEM\", \c"
-			[ $rsys_users -eq 1 ] \
+			[ "$rsys_users" -eq 1 ] \
 				&& echo "There is 1 user logged in!" \
 				|| echo "There are $rsys_users users logged in!"
 		fi
@@ -118,9 +123,8 @@ do_rcmd() {
 NO_WAKE=
 
 # Check required tools
-for t in fping ssh etherwake; do
-	type "$t" >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
+for t in fping ssh etherwake lockfile-create; do
+	if ! command -v "$t" >/dev/null 2>&1; then
 		echo "$NAME: Required tool \"$t\" missing, aborting!"
 		exit 3
 	fi
@@ -147,12 +151,27 @@ while [ $# -gt 0 ]; do
 		echo "$NAME: Can't read \"$cnf\"!"
 		r=1
 	else
-		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: 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=$?
+			echo "$NAME: Done ($r) - $(date "+%Y-%m-%d %H:%M:%S")"
+			rm -f "$lck"
+		else
+			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
+
+echo "$NAME: All done, exit code $result - $(date "+%Y-%m-%d %H:%M:%S")"
 exit $result