Merge pull request #4141 from raspiblitz/dev

merge v1.10.0rc5

build_sdcard.sh

@@ -397,7 +397,7 @@ if [ "$(compgen -u | grep -c pi)" -eq 0 ];then
 fi
 
 # special prepare when Raspbian
-if [ "${baseimage}" = "raspios_arm64" ] || [ "${baseimage}" = "debian" ]; then
+if [ "${baseimage}" = "raspios_arm64" ]; then
 
   echo -e "\n*** PREPARE RASPBERRY OS VARIANTS ***"
   apt_install raspi-config

home.admin/_provision_.sh

@@ -85,7 +85,6 @@ mkdir /home/admin/.lnd/data >> ${logFile} 2>&1
 cp -r /mnt/hdd/lnd/data/chain /home/admin/.lnd/data/chain >> ${logFile} 2>&1
 chown -R admin:admin /home/admin/.${network} >> ${logFile} 2>&1
 chown -R admin:admin /home/admin/.lnd >> ${logFile} 2>&1
-cp /home/admin/assets/${network}d.service /etc/systemd/system/${network}d.service >> ${logFile} 2>&1
 cp /home/admin/assets/tmux.conf.local /mnt/hdd/.tmux.conf.local >> ${logFile} 2>&1
 chown admin:admin /mnt/hdd/.tmux.conf.local >> ${logFile} 2>&1
 ln -s -f /mnt/hdd/.tmux.conf.local /home/admin/.tmux.conf.local >> ${logFile} 2>&1

home.admin/_version.info

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

home.admin/config.scripts/bitcoin.install.sh

@@ -5,7 +5,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ];then
   echo
   echo "bitcoin.install.sh install - called by build.sdcard.sh"
   echo "Install or remove parallel chains for Bitcoin Core:"
-  echo "bitcoin.install.sh [on|off] [signet|testnet|mainnet]"
+  echo "bitcoin.install.sh [install|on|off] [signet|testnet|mainnet]"
   echo
   exit 1
 fi
@@ -251,8 +251,8 @@ signet.addnode=nsgyo7begau4yecc46ljfecaykyzszcseapxmtu6adrfagfrrzrlngyd.onion:38
 [Unit]
 Description=Bitcoin daemon on ${CHAIN}
 
-After=network-online.target
-Wants=network-online.target
+Wants=redis.service
+After=redis.service
 
 [Service]
 Environment='MALLOC_ARENA_MAX=1'