reboot signaling

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

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

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 "