highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-10-05 14:03:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove script stop/block on CL install (#4391)

Browse Source 
* mark as v1.11.0rc2
* make non-interactive
* remove rpi-first-boot-wizard
This commit is contained in:
/rootzoll
2024-01-31 21:45:04 +01:00
committed by GitHub
parent 60c58ec6df
commit 81ebfb7902
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_sdcard.sh
View File

@@ -422,7 +422,7 @@ if ! compgen -u pi; then
adduser pi sudo adduser pi sudo
fi fi
# special prepare when Raspbian # special prepare when RaspberryPi OS
if [ "${baseimage}" = "raspios_arm64" ]; then if [ "${baseimage}" = "raspios_arm64" ]; then
echo -e "\n*** PREPARE RASPBERRY OS VARIANTS ***" echo -e "\n*** PREPARE RASPBERRY OS VARIANTS ***"
@@ -499,6 +499,10 @@ if [ $(uname -a | grep -c 'tegra') -gt 0 ] ; then
systemctl set-default multi-user.target systemctl set-default multi-user.target
fi fi
# remove rpi-first-boot-wizard
apt purge piwiz -y
userdel -r rpi-first-boot-wizard
echo -e "\n*** CONFIG ***" echo -e "\n*** CONFIG ***"
# based on https://raspibolt.github.io/raspibolt/raspibolt_20_pi.html#raspi-config # based on https://raspibolt.github.io/raspibolt/raspibolt_20_pi.html#raspi-config

6
home.admin/00settingsMenuBasics.sh
View File

@@ -427,16 +427,18 @@ if [ "${clNode}" != "${choice}" ]; then
echo "# Core Lightning NODE Setting changed .." echo "# Core Lightning NODE Setting changed .."
if [ "${choice}" = "on" ]; then if [ "${choice}" = "on" ]; then
echo "# turning ON" echo "# turning ON"
/home/admin/config.scripts/cl.install.sh on mainnet /home/admin/config.scripts/cl.install.sh on mainnet
# generate wallet from seedwords or just display (write to dev/null to not write seed words to logs) # generate wallet from seedwords or just display (write to dev/null to not write seed words to logs)
/home/admin/config.scripts/cl.hsmtool.sh new mainnet 1>/dev/null echo "Generating CL wallet seedwords .."
/home/admin/config.scripts/cl.hsmtool.sh new mainnet noninteractive
if [ "${testnet}" == "on" ]; then if [ "${testnet}" == "on" ]; then
# no seed for testnet # no seed for testnet
echo "Turn on CL testnet .."
/home/admin/config.scripts/cl.install.sh on testnet /home/admin/config.scripts/cl.install.sh on testnet
fi fi
if [ "${signet}" == "on" ]; then if [ "${signet}" == "on" ]; then
# no seed for signet # no seed for signet
echo "Turn on CL signet .."
/home/admin/config.scripts/cl.install.sh on signet /home/admin/config.scripts/cl.install.sh on signet
fi fi

2
home.admin/_version.info
View File

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

15
home.admin/config.scripts/cl.hsmtool.sh
View File

@@ -14,7 +14,7 @@ if [ $# -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]||\
echo echo
echo "Usage:" echo "Usage:"
echo "Create new wallet:" echo "Create new wallet:"
echo "cl.hsmtool.sh [new] [mainnet|testnet|signet] [?seedpassword]" echo "cl.hsmtool.sh [new] [mainnet|testnet|signet] [?seedpassword|noninteractive]"
echo "cl.hsmtool.sh [new-force] [mainnet|testnet|signet] [?seedpassword]" echo "cl.hsmtool.sh [new-force] [mainnet|testnet|signet] [?seedpassword]"
echo "There will be no seedpassword(passphrase) used by default" echo "There will be no seedpassword(passphrase) used by default"
echo "new-force will backup the old wallet and will work without interaction" echo "new-force will backup the old wallet and will work without interaction"
@@ -190,7 +190,10 @@ if [ "$1" = "new" ] || [ "$1" = "new-force" ] || [ "$1" = "seed" ] || [ "$1" = "
if sudo ls /home/bitcoin/.lightning/${CLNETWORK}/seedwords.info 2>1 1>/dev/null; then if sudo ls /home/bitcoin/.lightning/${CLNETWORK}/seedwords.info 2>1 1>/dev/null; then
echo "# There is a /home/bitcoin/.lightning/${CLNETWORK}/seedwords.info so don't create new" echo "# There is a /home/bitcoin/.lightning/${CLNETWORK}/seedwords.info so don't create new"
# show seed # show seed
sudo /home/admin/config.scripts/cl.install.sh display-seed mainnet if [ "$3" != "noninteractive" ]; then
sudo /home/admin/config.scripts/cl.backup.sh seed-export-gui
sudo /home/admin/config.scripts/cl.install.sh display-seed mainnet
fi
exit 0 exit 0
else else
# there should be no hsm_secret without seedwords.info, but protect this edge-case # there should be no hsm_secret without seedwords.info, but protect this edge-case
@@ -219,10 +222,14 @@ if [ "$1" = "new" ] || [ "$1" = "new-force" ] || [ "$1" = "seed" ] || [ "$1" = "
if [ "$1" = "new" ]; then if [ "$1" = "new" ]; then
seedpassword="$3" seedpassword="$3"
echo "new seedpassword='${seedpassword}'"
# get 24 words # get 24 words
source <(python /home/admin/config.scripts/blitz.mnemonic.py generate) source <(python /home/admin/config.scripts/blitz.mnemonic.py generate)
#TODO seedwords to cl.backup.sh seed-export-gui if [ "${seedpassword}" != "noninteractive" ]; then
/home/admin/config.scripts/cl.backup.sh seed-export-gui "${seedwords6x4}" /home/admin/config.scripts/cl.backup.sh seed-export-gui "${seedwords6x4}"
else
seedpassword=""
fi
elif [ "$1" = "new-force" ]; then elif [ "$1" = "new-force" ]; then
# get 24 words # get 24 words
source <(python /home/admin/config.scripts/blitz.mnemonic.py generate) source <(python /home/admin/config.scripts/blitz.mnemonic.py generate)