mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2025-02-28 16:58:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3860 from rootzoll/3858fixmigration

Browse source 
#3858 Fix new Umbrel migration
This commit is contained in:
/rootzoll 2023-05-22 00:15:03 +02:00 • committed by GitHub
commit 5505bd34ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats 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