From 8e984c58c91450950d38211de1c32b13bbd53394 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Mon, 3 May 2021 14:56:39 +0200
Subject: [PATCH] prepare config

---
 home.admin/setup.scripts/setupDialogControl.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/home.admin/setup.scripts/setupDialogControl.sh b/home.admin/setup.scripts/setupDialogControl.sh
index 5f30c1c42..a44367659 100755
--- a/home.admin/setup.scripts/setupDialogControl.sh
+++ b/home.admin/setup.scripts/setupDialogControl.sh
@@ -105,11 +105,18 @@ if [ "${migrationOS}" == "" ]; then
 
   echo "# CREATING raspiblitz.conf from your setup choices"
 
-  # prepare the config file (what will later become the raspiblitz.config)
+  # prepate config file
+  CONFIGFILE="/mnt/hdd/raspiblitz.conf.tmp"
+  sudo rm $CONFIGFILE 2>/dev/null
+  sudo chown admin:admin $CONFIGFILE
+  sudo chmod 777 $CONFIGFILE
+
+  # source the raspiblitz version
   source /home/admin/_version.info
 
-  CONFIGFILE="/mnt/hdd/raspiblitz.config"
-  rm $CONFIGFILE 2>/dev/null
+  # source the setup state fresh
+  source $SETUPFILE
+
   echo "# RASPIBLITZ CONFIG FILE" > $CONFIGFILE
   echo "raspiBlitzVersion='${codeVersion}'" >> $CONFIGFILE
   echo "lcdrotate=1" >> $CONFIGFILE
@@ -124,6 +131,9 @@ else
   # Process Migration
   # TODO: move this part later outside of dialog controller and combine with data from WebUI
 
+  # source the setup state fresh
+  source $SETUPFILE
+
   echo "TODO: Process Migration"
   exit 1