From 9eb8b8c1607b178e2a56fd904f82230d03e83edd Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Sun, 5 Sep 2021 15:05:45 +0200
Subject: [PATCH] make sure of temp mount

---
 home.admin/_bootstrap.sh       | 13 ++++++++++++-
 home.admin/_provision.setup.sh |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index d2da5db0f..f5f47ea96 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -383,12 +383,13 @@ echo "HDD already part of system: $isMounted" >> $logFile
 if [ ${isMounted} -eq 0 ]; then
 
   # temp mount the HDD
-  echo "Temp mounting data drive ($hddCandidate)" >> $logFile
+  echo "Temp mounting (1) data drive ($hddCandidate)" >> $logFile
   if [ "${hddFormat}" != "btrfs" ]; then
     source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
   else
     source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate})
   fi
+  echo "Temp mounting (1) result: ${isMounted}" >> $logFile
 
   # write data needed for setup process into raspiblitz.info
   echo "hddCandidate='${hddCandidate}'" >> ${infoFile}
@@ -483,6 +484,16 @@ if [ ${isMounted} -eq 0 ]; then
   # mark system on sd card as in setup process
   echo "the provision process was started but did not finish yet" > /home/admin/provision.flag
 
+  # make HDD is still temp mounted
+  echo "Temp mounting (2) data drive ($hddCandidate)" >> $logFile
+  source <(/home/admin/config.scripts/internet.sh status)
+  if [ "${hddFormat}" != "btrfs" ]; then
+    source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
+  else
+    source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate})
+  fi
+  echo "Temp mounting (2) result: ${isMounted}" >> $logFile
+
   # make sure all links between directories/drives are correct
   echo "Refreshing links between directories/drives .." >> $logFile
   sudo /home/admin/config.scripts/blitz.datadrive.sh link
diff --git a/home.admin/_provision.setup.sh b/home.admin/_provision.setup.sh
index 58419dc6c..8f90d8929 100755
--- a/home.admin/_provision.setup.sh
+++ b/home.admin/_provision.setup.sh
@@ -78,7 +78,7 @@ sudo cp /home/admin/assets/${network}.conf /home/admin/.${network}/${network}.co
 sudo chown -R admin:admin /home/admin/.${network} >>${logFile} 2>&1
 
 # make sure all directories are linked
-sudo /home/admin/config.scripts/blitz.datadrive.sh link
+sudo /home/admin/config.scripts/blitz.datadrive.sh link >> ${logFile}
 
 # test bitcoin config
 confExists=$(sudo ls /mnt/hdd/${network}/${network}.conf | grep -c "${network}.conf")