X-Git-Url: https://arthur.barton.de/gitweb/?p=trigger-rcmd.git;a=blobdiff_plain;f=scripts%2Ftrigger-rcmd;h=90c19bdb18107d7c505cecff9502b97c91f402db;hp=75aeddb8ac0acbefbd5a4332f5dcd2b8fe4c860d;hb=7f43dd0b79c807c87bec4bdd1506bb27b6141cc1;hpb=1bd704bbae0c9c9759c988e9889fde17f39a8f81;ds=sidebyside

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index 75aeddb..90c19bd 100755
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -74,12 +74,14 @@ do_rcmd() {
 	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
+		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 ..."
@@ -90,7 +92,7 @@ do_rcmd() {
 	echo
 
 	# shellcheck disable=2029
-	ssh -q "$SYSTEM" "$CMD" </dev/null ; r=$?
+	ssh -o PreferredAuthentications=publickey -q "$SYSTEM" "$CMD" </dev/null ; r=$?
 
 	echo
 	echo "$NAME: Remote command ended with return code $r."
@@ -101,7 +103,7 @@ do_rcmd() {
 		if [ "$rsys_users" = "0" ]; then
 			echo "$NAME: Power off \"$SYSTEM\" again ..."
 			# shellcheck disable=2029
-			ssh -q "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/dev/null
+			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