highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-11-19 10:28:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3862 from rootzoll/dev

Browse Source 
bugs fixed for v1.9.0 release
This commit is contained in:
/rootzoll
2023-05-22 23:31:46 +02:00
committed by GitHub
parent 53419f8874 3ed2502cab
commit 3b5b623885
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
home.admin/config.scripts/blitz.datadrive.sh
View File

@@ -371,8 +371,8 @@ if [ "$1" = "status" ]; then
lndVersion=$(grep "lightninglabs/lnd" /mnt/storage/umbrel/docker-compose.yml 2>/dev/null | sed 's/.*lnd://' | sed 's/@.*//') lndVersion=$(grep "lightninglabs/lnd" /mnt/storage/umbrel/docker-compose.yml 2>/dev/null | sed 's/.*lnd://' | sed 's/@.*//')
fi fi
echo "hddVersionBTC='${btcVersion}'" echo "hddVersionBTC='${btcVersion}'"
echo "hddVersionLND='${clnVersion}'" echo "hddVersionCLN='${clnVersion}'"
echo "hddVersionCLN='${lndVersion}'" echo "hddVersionLND='${lndVersion}'"
elif [ ${isMyNodeHDD} -gt 0 ]; then elif [ ${isMyNodeHDD} -gt 0 ]; then
hddGotMigrationData="mynode" hddGotMigrationData="mynode"
elif [ ${isCitadelHDD} -gt 0 ]; then elif [ ${isCitadelHDD} -gt 0 ]; then

5
home.admin/config.scripts/blitz.migration.sh
View File

@@ -108,11 +108,12 @@ migrate_raspiblitz_conf () {
if [ "$1" = "migration-umbrel" ]; then if [ "$1" = "migration-umbrel" ]; then
# make sure data drive is not (regular) mounted
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status) source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status)
if [ "${isMounted}" == "1" ]; then if [ "${isMounted}" == "1" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh unmount) source <(sudo /home/admin/config.scripts/blitz.datadrive.sh unmount)
fi fi
# make sure data drive is mounted # make sure data drive is temp-mounted
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status) source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status)
if [ "${isMounted}" != "1" ]; then if [ "${isMounted}" != "1" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount) source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount)
@@ -209,6 +210,8 @@ if [ "$1" = "migration-umbrel" ]; then
# LND since 0.5.0 umbrel uses a different data structure # LND since 0.5.0 umbrel uses a different data structure
echo "### LND ###" echo "### LND ###"
if [ ${versionMajor} -eq 0 ] && [ ${versionMiner} -gt 4 ]; then if [ ${versionMajor} -eq 0 ] && [ ${versionMiner} -gt 4 ]; then
# rename lnd.conf (seems to be a think since umbrel 0.5.3)
sudo mv /mnt/hdd/umbrel/app-data/lightning/data/lnd/umbrel-lnd.conf /mnt/hdd/umbrel/app-data/lightning/data/lnd/lnd.conf 2>/dev/null
# new way - lnd might even not exist because its optional # new way - lnd might even not exist because its optional
lndExists=$(sudo ls /mnt/hdd/umbrel/app-data/lightning/data/lnd/lnd.conf | grep -c "lnd.conf") lndExists=$(sudo ls /mnt/hdd/umbrel/app-data/lightning/data/lnd/lnd.conf | grep -c "lnd.conf")
if [ "${lndExists}" == "1" ]; then if [ "${lndExists}" == "1" ]; then

6
home.admin/config.scripts/cl-plugin.backup.sh
View File

@@ -89,7 +89,7 @@ if [ "$1" = on ]; then
# https://github.com/lightningd/plugins/tree/master/backup#setup # https://github.com/lightningd/plugins/tree/master/backup#setup
echo "# Initialize the backup plugin" echo "# Initialize the backup plugin"
cd ${plugindir}/backup/ || exit 1 cd ${plugindir}/backup/ || exit 1
sudo -u bitcoin poetry run ./backup-cli init --lightning-dir /home/bitcoin/.lightning/${CLNETWORK} \ sudo -u bitcoin poetry run /home/bitcoin/cl-plugins-available/plugins/backup/backup-cli init --lightning-dir /home/bitcoin/.lightning/${CLNETWORK} \
file:///home/bitcoin/${netprefix}lightningd.sqlite3.backup file:///home/bitcoin/${netprefix}lightningd.sqlite3.backup
if [ $(crontab -u admin -l | grep -c "backup-compact $CHAIN") -eq 0 ]; then if [ $(crontab -u admin -l | grep -c "backup-compact $CHAIN") -eq 0 ]; then
@@ -134,7 +134,7 @@ then
sudo systemctl stop ${netprefix}lightningd sudo systemctl stop ${netprefix}lightningd
# https://github.com/lightningd/plugins/tree/master/backup#restoring-a-backup # https://github.com/lightningd/plugins/tree/master/backup#restoring-a-backup
# poetry run ./backup-cli restore file:///mnt/external/location ~/.lightning/bitcoin/lightningd.sqlite3 # poetry run /home/bitcoin/cl-plugins-available/plugins/backup/backup-cli restore file:///mnt/external/location ~/.lightning/bitcoin/lightningd.sqlite3
# make sure to not overwrite old database # make sure to not overwrite old database
if sudo ls /home/bitcoin/.lightning/${CLNETWORK}/lightningd.sqlite3; then if sudo ls /home/bitcoin/.lightning/${CLNETWORK}/lightningd.sqlite3; then
@@ -149,7 +149,7 @@ then
# restore # restore
cd ${plugindir}/backup/ || exit 1 cd ${plugindir}/backup/ || exit 1
sudo -u bitcoin poetry run ./backup-cli restore \ sudo -u bitcoin poetry run /home/bitcoin/cl-plugins-available/plugins/backup/backup-cli restore \
file:///home/bitcoin/${netprefix}lightningd.sqlite3.backup \ file:///home/bitcoin/${netprefix}lightningd.sqlite3.backup \
/home/bitcoin/.lightning/${CLNETWORK}/lightningd.sqlite3 /home/bitcoin/.lightning/${CLNETWORK}/lightningd.sqlite3