From 37851d67b8a8beaadb58c515d6e04014efb6fa51 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Thu, 9 Sep 2021 00:12:46 +0200
Subject: [PATCH] improve provision error debug

---
 home.admin/_bootstrap.sh        | 4 +++-
 home.admin/_provision.setup.sh  | 4 ++--
 home.admin/_provision.update.sh | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 68186f47b..a1d1c2e79 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -536,6 +536,7 @@ if [ ${isMounted} -eq 0 ]; then
     sed -i "s/^message=.*/message='Provision Setup'/g" ${infoFile}
     sudo /home/admin/_provision.setup.sh
     errorState=$?
+    sudo cat /home/admin/raspiblitz.log.setup
     if [ "$errorState" != "0" ]; then
       echo "EXIT _provision.setup.sh BECAUSE OF ERROR STATE ($errorState)" >> $logFile
       echo "This can also happen if _provision.setup.sh has syntax errors" >> $logFile
@@ -561,12 +562,13 @@ if [ ${isMounted} -eq 0 ]; then
     fi
   fi
 
-  # if update/recovery/migration
+  # if update/recovery/migration-followup
   if [ "${setupPhase}" == "update" ] || [ "${setupPhase}" == "recovery" ] || [ "${setupPhase}" == "migration" ]; then
     echo "Calling _provision.update.sh .." >> $logFile
     sed -i "s/^message=.*/message='Provision Update/Recovery/Migration'/g" ${infoFile}
     sudo /home/admin/_provision.update.sh
     errorState=$?
+    sudo cat /home/admin/raspiblitz.log.update
     if [ "$errorState" != "0" ]; then
       echo "EXIT _provision.update.sh BECAUSE OF ERROR STATE ($errorState)" >> $logFile
       echo "This can also happen if _provision.update.sh has syntax errors" >> $logFile
diff --git a/home.admin/_provision.setup.sh b/home.admin/_provision.setup.sh
index 0b0381169..a9faee954 100755
--- a/home.admin/_provision.setup.sh
+++ b/home.admin/_provision.setup.sh
@@ -4,7 +4,7 @@
 # not on recoveries or updates
 
 # LOGFILE - store debug logs of bootstrap
-logFile="/home/admin/raspiblitz.log"
+logFile="/home/admin/raspiblitz.log.setup"
 
 # INFOFILE - state data from bootstrap
 infoFile="/home/admin/raspiblitz.info"
@@ -19,7 +19,7 @@ configFile="/mnt/hdd/raspiblitz.conf"
 source ${configFile}
 
 # log header
-echo "" >> ${logFile}
+echo "" > ${logFile}
 echo "###################################" >> ${logFile}
 echo "# _provision.setup.sh" >> ${logFile}
 echo "###################################" >> ${logFile}
diff --git a/home.admin/_provision.update.sh b/home.admin/_provision.update.sh
index 15eabdcd2..2e21fa013 100755
--- a/home.admin/_provision.update.sh
+++ b/home.admin/_provision.update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # LOGFILE - store debug logs of bootstrap
-logFile="/home/admin/raspiblitz.log"
+logFile="/home/admin/raspiblitz.log.update"
 
 # INFOFILE - state data from bootstrap
 infoFile="/home/admin/raspiblitz.info"
@@ -14,7 +14,7 @@ setupFile="/var/cache/raspiblitz/temp/raspiblitz.setup"
 source ${setupFile}
 
 # log header
-echo "" >> ${logFile}
+echo "" > ${logFile}
 echo "###################################" >> ${logFile}
 echo "# _provision.update.sh" >> ${logFile}
 echo "###################################" >> ${logFile}