From ad1dbc673a88b9687cda927b28414ca4255d63b1 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Mon, 4 Oct 2021 09:53:17 +0200
Subject: [PATCH] #2588 double enforce setup reboot

---
 home.admin/_bootstrap.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 1c7f23d26..65b9b83b3 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -760,8 +760,11 @@ if [ ${isMounted} -eq 0 ]; then
   # AFTER SETUP REBOOT
   # touchscreen activation, start with configured SWAP, fix LCD text bug
   sudo cp /home/admin/raspiblitz.log /home/admin/raspiblitz.setup.log
-  /home/admin/config.scripts/blitz.shutdown.sh reboot finalsetup
-  sleep 100
+  timeout 60 /home/admin/config.scripts/blitz.shutdown.sh reboot finalsetup
+  sleep 10
+  # if system has not rebooted yet - force reboot directly
+  sudo shutdown -r now
+  sleep 60
   exit 0
 
 else