From ddf9762f3da15d662e32905a1195e5d93ad72329 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Thu, 9 Sep 2021 12:51:50 +0200
Subject: [PATCH]  #2499 move .force file to raspiblitz.conf in code

---
 home.admin/_bootstrap.sh                     | 21 ++++++++++----------
 home.admin/config.scripts/blitz.datadrive.sh |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 0082f4809..711e4e3aa 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -398,16 +398,6 @@ if [ ${cmdlineExists} -eq 1 ] && [ ${#hddAdapterUSB} -gt 0 ] && [ ${hddAdapterUS
   fi
 else 
   echo "Skipping UASP deactivation ... cmdlineExists(${cmdlineExists}) hddAdapterUSB(${hddAdapterUSB}) hddAdapterUSAP(${hddAdapterUSAP})" >> $logFile
-  
-  if [ ${uaspForced} -eq 1 ]; then
-    # Add to raspiblitz.conf if not already there
-    entryExists=$(cat /mnt/hdd/raspiblitz.conf 2>/dev/null | grep -c 'forceUasp=on')
-    if [ ${entryExists} -eq 0 ]; then
-        sudo sed -i '/forceUasp=.*/d' /mnt/hdd/raspiblitz.conf
-        echo "forceUasp=on" >> /mnt/hdd/raspiblitz.conf
-        echo "DONE forceUasp=on recorded in raspiblitz.conf" >> $logFile
-    fi
-  fi
 fi
 
 # check if the HDD is auto-mounted ( auto-mounted = setup-done)
@@ -774,6 +764,17 @@ source ${configFile}
 # update public IP on boot - set to domain if available
 /home/admin/config.scripts/internet.sh update-publicip ${lndAddress} 
 
+# make constant UASP entry in raspiblitz.conf if still done by flag file
+# uaspForced comes from blitz.datadrive.sh status
+if [ ${uaspForced} -eq 1 ]; then
+  entryExists=$(cat /mnt/hdd/raspiblitz.conf 2>/dev/null | grep -c 'forceUasp=on')
+  if [ ${entryExists} -eq 0 ]; then
+      sudo sed -i '/forceUasp=.*/d' /mnt/hdd/raspiblitz.conf
+      echo "forceUasp=on" >> /mnt/hdd/raspiblitz.conf
+      echo "DONE forceUasp=on recorded in raspiblitz.conf" >> $logFile
+  fi
+fi
+
 #################################
 # MAKE SURE USERS HAVE LATEST LND CREDENTIALS
 #################################
diff --git a/home.admin/config.scripts/blitz.datadrive.sh b/home.admin/config.scripts/blitz.datadrive.sh
index 2549a1fc7..72c883fde 100755
--- a/home.admin/config.scripts/blitz.datadrive.sh
+++ b/home.admin/config.scripts/blitz.datadrive.sh
@@ -390,7 +390,7 @@ if [ "$1" = "status" ]; then
       hddAdapterUSAP=1
       echo "uaspForced=1"
     fi
-    if [ $(grep -c "forceUasp=on" < /mnt/hdd/raspiblitz.conf) -eq 1 ]; then
+    if [ $(cat /mnt/hdd/raspiblitz.conf 2>/dev/null | grep -c "forceUasp=on") -eq 1 ]; then
       hddAdapterUSAP=1
     fi