Merge pull request #4493 from raspiblitz/dev

README.md

@@ -4,7 +4,7 @@
 
 _Build your own Lightning & Bitcoin Fullnode on a RaspberryPi with an optional Display._
 
-`Version 1.11.0rc4 with bitcoin 26.0, lnd 0.17.3 & Core Lightning 23.11.2` ([api](https://github.com/fusion44/blitz_api)|[web](https://github.com/raspiblitz/raspiblitz-web))
+`Version 1.11.0rc5 with bitcoin 26.0, lnd 0.17.3 & Core Lightning 24.02.1` ([api](https://github.com/fusion44/blitz_api)|[web](https://github.com/raspiblitz/raspiblitz-web))
 
 ![RaspiBlitz](pictures/raspiblitz.jpg)
 
@@ -169,8 +169,8 @@ This is the sd card image you should choose if your at the beginning of your Ras
 _WARNING: THIS IS STILL A RELEASE CANDIDATE VERSION</br>
 JUST USE FOR TESTING, HIGHER RISK OF LOSING FUNDS!_
 
-- **FATPACK SD CARD IMAGE ⮕ [raspiblitz-fat-v1.11.0rc4-2024-03-15.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.11.0rc4-2024-03-15.img.gz)**
-- SHA-256: 2081ad3d93e56672b6c75043a825a634a165ff1b4d7ca00d106ba74ab257a6af
+- **FATPACK SD CARD IMAGE ⮕ [raspiblitz-fat-v1.11.0rc5-2024-03-20.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.11.0rc5-2024-03-20.img.gz)**
+- SHA-256: ed9c986e2d3a64244aae50344237c695c32e9966939ef0e637a1a4440d9dd235
 <!--
 - GPG 64-bit (main): 1C73 060C 7C17 6461 & (sub): AA9D D1B5 CC56 47DA
 - Signature-File: [raspiblitz-fat-v1.10.0-2023-09-22.img.gz.sig](https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.10.0-2023-09-22.img.gz.sig)
@@ -185,8 +185,8 @@ This is the sd card image for RaspiBlitz users that are already more experienced
 _WARNING: THIS IS STILL A RELEASE CANDIDATE VERSION</br>
 JUST USE FOR TESTING, HIGHER RISK OF LOSING FUNDS!_
 
-- **MINIMAL SD CARD IMAGE ⮕ [raspiblitz-min-v1.11.0rc4-2024-03-15.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.11.0rc4-2024-03-15.img.gz)**
-- SHA-256: 401c44c056bdaf94bf6b136ab5f5fdb2eab954914f486e31dd1dbbd677907a4c
+- **MINIMAL SD CARD IMAGE ⮕ [raspiblitz-min-v1.11.0rc5-2024-03-20.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.11.0rc5-2024-03-20.img.gz)**
+- SHA-256: 010f212871cb2315e944726857a74594fab0fc405abe1b70e6ccff847f84fbc4
 <!--
 - GPG 64-bit (main): 1C73 060C 7C17 6461 & (sub): AA9D D1B5 CC56 47DA
 - Signature-File: [raspiblitz-min-v1.10.0-2023-09-22.img.gz.sig](https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.10.0-2023-09-22.img.gz.sig)

home.admin/_bootstrap.sh

@@ -121,13 +121,11 @@ cat $infoFile >> $logFile
 # when a file 'stop' is on the sd card bootfs partition root - stop for manual provision
 flagExists=$(ls /boot/firmware/stop | grep -c 'stop')
 if [ "${flagExists}" == "1" ]; then
-  # remove flag
-  rm /boot/firmware/stop
   # set state info
   /home/admin/_cache.sh set state "stop"
   /home/admin/_cache.sh set message "stopped for manual provision"
   # log info
-  echo "INFO: 'bootstrap stopped - run release after manual provison'" >> ${logFile}
+  echo "INFO: 'bootstrap stopped - run command release after manual provison to remove stop flag'" >> ${logFile}"
   exit 0
 fi
 

home.admin/config.scripts/blitz.preparerelease.sh

@@ -3,6 +3,10 @@
 # Just run this script once after a fresh sd card build
 # to prepare the image for release as a downloadable sd card image
 
+# remove stop flag (if exists)
+echo "deleting stop flag .."
+sudo rm /boot/firmware/stop 2>/dev/null
+
 # cleaning logs
 echo "deleting raspiblitz & system logs .."
 sudo rm /var/log/* 2>/dev/null

home.admin/config.scripts/bonus.electrs.sh

@@ -314,16 +314,6 @@ fi
 if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   echo "# ACTIVATING ELECTRS"
 
-  # check and create storage dir
-  if ! sudo ls /mnt/hdd/app-storage/electrs 2>/dev/null; then
-    sudo mkdir /mnt/hdd/app-storage/electrs
-    echo
-    echo "# The electrs database will be built in /mnt/hdd/app-storage/electrs/db. Takes ~18 hours and ~50Gb diskspace"
-    echo
-  fi
-  # always fix user id
-  sudo chown -R electrs:electrs /mnt/hdd/app-storage/electrs
-
   isInstalled=$(sudo ls /etc/systemd/system/electrs.service 2>/dev/null | grep -c 'electrs.service')
   if [ ${isInstalled} -eq 0 ]; then
 
@@ -342,6 +332,16 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
       fi
     fi
 
+    # check and create storage dir
+    if ! sudo ls /mnt/hdd/app-storage/electrs 2>/dev/null; then
+      sudo mkdir /mnt/hdd/app-storage/electrs
+      echo
+      echo "# The electrs database will be built in /mnt/hdd/app-storage/electrs/db. Takes ~18 hours and ~50Gb diskspace"
+      echo
+    fi
+    # always fix user id
+    sudo chown -R electrs:electrs /mnt/hdd/app-storage/electrs
+
     echo
     echo "# Getting RPC credentials from the bitcoin.conf"
     # read PASSWORD_B