From c138d9201e3544ce47534fc6401797f1d8611b9b Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Sun, 26 Apr 2026 02:08:34 +0200
Subject: [PATCH] fix: detach reboot command to avoid false SSH failures

---
 bin/netupgrade | 5 ++++-
 state.md       | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/netupgrade b/bin/netupgrade
index 03696f6..c2bb1bf 100755
--- a/bin/netupgrade
+++ b/bin/netupgrade
@@ -201,8 +201,11 @@ runCmd() { # $1=host $2=name $3=cmd
 
 	case ${CMD} in
 		reboot)
-			if ! runSSH "${HOST}" reboot | tee -a "${LOGFILENAME}"; then
+			echo "reboot (detached)" | tee -a "${LOGFILENAME}"
+			if ! runSSH "${HOST}" sh -c 'nohup sh -c "reboot || /sbin/reboot || shutdown -r now" >/dev/null 2>&1 </dev/null &' | tee -a "${LOGFILENAME}"; then
 				ERROR=1
+			else
+				sleep 1
 			fi
 		;;
 		apt)
diff --git a/state.md b/state.md
index b0346d4..4f5087b 100644
--- a/state.md
+++ b/state.md
@@ -121,6 +121,7 @@ Supported action types currently include:
 - The `pacman` orphan cleanup remote command now avoids nested `bash -lc` argument-passing issues by selecting between two simple remote `sh -c` commands, one with `--noconfirm` and one without
 - The `docker-stacks` action uses a remote shell script sent over SSH stdin, with the stack directory exported as a remote environment assignment before `bash -s`, to keep path handling working after recent SSH command-construction changes
 - Unknown actions and reboot SSH failures now propagate error status more consistently
+- The `reboot` action now triggers a detached remote reboot command (`reboot || /sbin/reboot || shutdown -r now` under `nohup`) so an expected SSH disconnect during restart is less likely to be reported as a failure
 - A focused code review identified the next recommended work items and suggested splitting them into separate commits rather than combining them in one larger hardening change
 - `whiptail` checklist defaults are now passed explicitly as `ON`/`OFF`, and selected items are parsed through a dedicated helper instead of relying on raw shell word splitting
 - The CLI help and README now clarify that `-f` preselects all nodes in the interactive checklist