Merge branch 'dev' into background_values_improvement

README.md

@@ -1,9 +1,10 @@
 <!-- omit in toc -->
+
 # ![RaspiBlitz](pictures/raspilogo_tile_400px.png)
 
 _Build your own Lightning & Bitcoin Fullnode on a RaspberryPi with an optional Display._
 
-`Version 1.10.0rc2 with bitcoin 25.0.0, lnd 0.16.4 & Core Lightning 23.05.2` ([api](https://github.com/fusion44/blitz_api)|[web](https://github.com/cstenglein/raspiblitz-web))
+`Version 1.10.0rc3 with bitcoin 25.0.0, lnd 0.16.4 & Core Lightning 23.05.2` ([api](https://github.com/fusion44/blitz_api)|[web](https://github.com/raspiblitz/raspiblitz-web))
 
 ![RaspiBlitz](pictures/raspiblitz.jpg)
 
@@ -14,7 +15,9 @@ Discover & develop the growing ecosystem of the Lightning Network by becoming a
 Build it as part of a [workshop](WORKSHOP.md) or as a weekend project yourself.
 
 ---
+
 <!-- omit in toc -->
+
 ## Table of Contents
 
 - [Feature Overview](#feature-overview)
@@ -164,11 +167,11 @@ In this section you find the latest ready-to-use RaspiBlitz SDcard images. Basic
 
 This is the sd card image you should choose if your at the beginning of your RaspiBlitz journey or you are a casual node runner wanna download the next update/upgrade - with WebUI & fast installing bonus apps.
 
-*WARNING: THIS IS STILL A RELEASE CANDIDATE VERSION</br>
+_WARNING: THIS IS STILL A RELEASE CANDIDATE VERSION</br>
-JUST USE FOR TESTING, HIGHER RISK OF LOSING FUNDS!*
+JUST USE FOR TESTING, HIGHER RISK OF LOSING FUNDS!_
 
-- __FATPACK SD CARD IMAGE ⮕ [raspiblitz-fat-v1.10.0rc2-2023-08-02.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.10.0rc2-2023-08-02.img.gz)__
+- **FATPACK SD CARD IMAGE ⮕ [raspiblitz-fat-v1.10.0rc3-2023-08-13.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.10.0rc3-2023-08-13.img.gz)**
-- SHA-256: a1a187a655a7b9b9ba6b3b1609d555a801f6be754d6fd209dfede9ff9e7379b8
+- SHA-256: 8ba43f92ebe62535c419b83b08e86362599d029def5a81920c14f68a96ce7adf
 <!--- GPG 64-bit (main): 1C73 060C 7C17 6461 & (sub): AA9D D1B5 CC56 47DA
 - Signature-File: [raspiblitz-fat-v1.9.0-2023-05-22.img.gz.sig](https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.9.0-2023-05-22.img.gz.sig)
 - Torrent: [raspiblitz-fat-v1.9.0-2022-12-21.img.gz.torrent](https://github.com/rootzoll/raspiblitz/raw/dev/home.admin/assets/raspiblitz-fat-v1.9.0-2023-05-22.img.gz.torrent) -->
@@ -178,11 +181,11 @@ JUST USE FOR TESTING, HIGHER RISK OF LOSING FUNDS!*
 
 This is the sd card image for RaspiBlitz users that are already more experienced and want to use just a limited set of features of the RaspiBlitz. This image has just the bare minimum of features pre-installed - LCD & HDMI output is off by default. Setup, Update or Recovery needs to be done thru SSH login - API & WebUI are later available but are not preinstalled/activated by default. The RaspiBlitz will download & compile just the tools that are in your ´raspiblitz.conf´ - this will take longer but as a trade-off this RaspiBlitz then just runs with a reduced set of dependencies and so a minimalized attack vector and better performance. Its for the serious & experienced node runners.
 
-*WARNING: THIS IS STILL A RELEASE CANDIDATE VERSION</br>
+_WARNING: THIS IS STILL A RELEASE CANDIDATE VERSION</br>
-JUST USE FOR TESTING, HIGHER RISK OF LOSING FUNDS!*
+JUST USE FOR TESTING, HIGHER RISK OF LOSING FUNDS!_
 
-- __MINIMAL SD CARD IMAGE ⮕ [raspiblitz-min-v1.10.0rc2-2023-08-02.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.10.0rc2-2023-08-02.img.gz)__
+- **MINIMAL SD CARD IMAGE ⮕ [raspiblitz-min-v1.10.0rc3-2023-08-13.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.10.0rc3-2023-08-13.img.gz)**
-- SHA-256: d2775524f5e51770294d873a9418b445041d98b97606c4510c3e322a180f9806
+- SHA-256: 1303c5c3b5657658b683df0caeb50989cdad5437037ae678a6ec5a4d1c04a5f9
 <!-- - GPG 64-bit (main): 1C73 060C 7C17 6461 & (sub): AA9D D1B5 CC56 47DA
 - Signature-File: [raspiblitz-min-v1.9.0-2023-05-22.img.gz.sig](https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.9.0-2023-05-22.img.gz.sig)
 - Torrent: [raspiblitz-min-v1.9.0-2022-12-21.img.gz.torrent](https://github.com/rootzoll/raspiblitz/raw/dev/home.admin/assets/raspiblitz-min-v1.9.0-2023-05-22.img.gz.torrent) -->

home.admin/_background.scan.sh

@@ -78,17 +78,17 @@ usermod -G bitcoin root
 ####################################################################
 
 # init values
-/home/admin/_cache.sh set system_temp_celsius "0" NX
+/home/admin/_cache.sh init system_temp_celsius "0"
-/home/admin/_cache.sh set system_temp_fahrenheit "0" NX
+/home/admin/_cache.sh init system_temp_fahrenheit "0"
-/home/admin/_cache.sh set system_count_longscan "0" NX
+/home/admin/_cache.sh init system_count_longscan "0"
-/home/admin/_cache.sh set system_count_undervoltage "0" NX
+/home/admin/_cache.sh init system_count_undervoltage "0"
-/home/admin/_cache.sh set system_count_start_blockchain "0" NX
+/home/admin/_cache.sh init system_count_start_blockchain "0"
-/home/admin/_cache.sh set system_count_start_lightning "0" NX
+/home/admin/_cache.sh init system_count_start_lightning "0"
-/home/admin/_cache.sh set system_count_start_tui "0" NX
+/home/admin/_cache.sh init system_count_start_tui "0"
-/home/admin/_cache.sh set btc_default_peers "0" NX
+/home/admin/_cache.sh init btc_default_peers "0"
-/home/admin/_cache.sh set btc_default_sync_percentage "0" NX
+/home/admin/_cache.sh init btc_default_sync_percentage "0"
-/home/admin/_cache.sh set btc_default_address "" NX
+/home/admin/_cache.sh init btc_default_address ""
-/home/admin/_cache.sh set btc_default_port "" NX
+/home/admin/_cache.sh init btc_default_port ""
 
 # import all base values from raspiblitz.info
 echo "importing: ${infoFile}"

home.admin/_cache.sh

@@ -14,6 +14,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "-help" ];
   echo "_cache.sh ramdisk [on|off]"
   echo "_cache.sh keyvalue [on|off]"
   echo
+  echo "_cache.sh init [key] [value] (only sets value if not exists)"
   echo "_cache.sh set [key] [value] [?expire-seconds]"
   echo "_cache.sh get [key1] [?key2] [?key3] ..."
   echo
@@ -133,7 +134,7 @@ elif [ "$1" = "keyvalue" ] && [ "$2" = "off" ]; then
 ###################
 
 # set
-elif [ "$1" = "set" ]; then
+elif [ "$1" = "set" ] || [ "$1" = "init" ]; then
 
   # get parameters
   keystr=$2
@@ -148,7 +149,7 @@ elif [ "$1" = "set" ]; then
 
 
   NX=""
-  if [ "${expireOrNx}" == "NX" ]; then
+  if [ "$1" = "init" ]; then
     NX="NX "
   else
   # filter from expire just numbers

home.admin/_version.info

@@ -1,3 +1,3 @@
 # RaspiBlitz Version - always [major].[main].[sub] (sub can be a string like '2rc1')
-codeVersion="1.10.0rc2"
+codeVersion="1.10.0rc3"
 # keep last line with comment

home.admin/config.scripts/lnd.backup.sh

@@ -169,6 +169,25 @@ if [ ${mode} = "lnd-export" ]; then
     exit 1
   fi
 
+  # if a backup device is connected (and has enogh free space) copy it there
+  source <(/home/admin/config.scripts/blitz.backupdevice.sh status)
+  if [ $isMounted == 1 ]; then
+
+    # get free space in bytes from backup device
+    freeSpace=$(df | grep -m1 "/mnt/backup" | awk '{print $4}')
+
+    # subtract 50MB for safety
+    freeSpace=$(expr ${freeSpace} - 50000000)
+
+    # check if enough space on backup device
+    if [ ${freeSpace} -gt ${byteSize} ]; then
+      echo "# making copy to backup device ..."
+      sudo cp ${downloadPath}/lnd-rescue-${md5checksum}.tar.gz /mnt/backup/lnd-rescue-${md5checksum}.tar.gz
+    else
+      echo "# not enough space on backup device for extra copy'"
+    fi
+  fi
+
   # output result data
   echo "# lnd service is stopped for security"
   echo "filename='${downloadPath}/lnd-rescue-${md5checksum}.tar.gz'"