From ee10fb4a707089986985d7c6efab8501dffc2232 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Mon, 30 Aug 2021 12:13:05 +0200
Subject: [PATCH] reboot signaling

---
 home.admin/00infoLCD.sh                   |  2 +-
 home.admin/_bootstrap.sh                  |  2 +-
 home.admin/setup.scripts/eventInfoWait.sh | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index d4c186ad3..d2a5f6f3d 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -92,7 +92,7 @@ while :
       source <(/home/admin/config.scripts/network.aliases.sh getvars)
     fi
 
-    if [ "${setupPhase}" != "done" ] || [ "${state}" == "copytarget" ] || [ "${state}" == "copysource" ] || [ "${state}" == "copystation" ]; then
+    if [ "${setupPhase}" != "done" ] || [ "${state}" == "reboot" ] || [ "${state}" == "shutdown" ] || [ "${state}" == "copytarget" ] || [ "${state}" == "copysource" ] || [ "${state}" == "copystation" ]; then
 
       # show status info during boot & setup & repair on LCD
       /home/admin/setup.scripts/eventInfoWait.sh "${state}" "${message}" lcd
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 3c8b12cc7..b60714b3b 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -198,7 +198,7 @@ fi
 
 if [ "${systemInitReboot}" == "1" ]; then
   sudo cp ${logFile} ${logFile}.systeminit
-  sudo sed -i "s/^state=.*/state=reboot-init/g" ${infoFile}
+  sudo sed -i "s/^state=.*/state=reboot/g" ${infoFile}
   sleep 8
   sudo shutdown -r now
   sleep 100
diff --git a/home.admin/setup.scripts/eventInfoWait.sh b/home.admin/setup.scripts/eventInfoWait.sh
index aa86b8e0b..66c948834 100644
--- a/home.admin/setup.scripts/eventInfoWait.sh
+++ b/home.admin/setup.scripts/eventInfoWait.sh
@@ -58,18 +58,18 @@ elif [ "${eventID}" == "reboot" ] && [ "${contentString}" == "finalsetup" ]; the
 Final Setup Reboot
 " 5 23
 
+elif [ "${eventID}" == "reboot" ] && [ "${contentString}" != "" ]; then
+
+    dialog --backtitle "${backtitle}" --cr-wrap --infobox "
+Rebooting (${contentString})
+" 5 35
+
 elif [ "${eventID}" == "reboot" ]; then
 
     dialog --backtitle "${backtitle}" --cr-wrap --infobox "
 Shutting down for reboot.
 " 5 30
 
-elif [ "${eventID}" == "reboot-init" ]; then
-
-    dialog --backtitle "${backtitle}" --cr-wrap --infobox "
-Rebooting for Setup (${contentString})
-" 5 30
-
 elif [ "${eventID}" == "error" ] && [ "${mode}" == "lcd" ]; then
 
     dialog --backtitle "${backtitle}" --cr-wrap --infobox "