From 4034f71279ffe58f08655aceb491639c60e43fd7 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Sat, 3 Jul 2021 20:31:11 +0200
Subject: [PATCH] switch position of source setupdata

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

diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index c93807089..e3abd5978 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -467,9 +467,6 @@ if [ ${isMounted} -eq 0 ]; then
   source ${infoFile}
   echo "# PROVISION PROCESS with setupPhase(${setupPhase})" >> $logFile
 
-  # try to load setup values if available
-  source ${setupFile} 2>/dev/null
-
   # mark system on sd card as in setup process
   echo "the provision process was started but did not finish yet" > /home/admin/provision.flag
 
@@ -497,7 +494,8 @@ if [ ${isMounted} -eq 0 ]; then
 
   ###################################
   # Set Password A (in all cases)
-
+  
+  source ${setupFile} 2>$logFile
   if [ "${passwordA}" == "" ]; then
     sed -i "s/^state=.*/state=error/g" ${infoFile}
     sed -i "s/^message=.*/message='config: missing passwordA'/g" ${infoFile}