From 00dc6423ab2869c8b7c89958f969e62e09e1b235 Mon Sep 17 00:00:00 2001 From: rootzoll Date: Sun, 21 May 2023 18:51:04 +0200 Subject: [PATCH 1/2] fix version swap --- home.admin/config.scripts/blitz.datadrive.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home.admin/config.scripts/blitz.datadrive.sh b/home.admin/config.scripts/blitz.datadrive.sh index 83a05f867..053efe536 100755 --- a/home.admin/config.scripts/blitz.datadrive.sh +++ b/home.admin/config.scripts/blitz.datadrive.sh @@ -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/@.*//') fi echo "hddVersionBTC='${btcVersion}'" - echo "hddVersionLND='${clnVersion}'" - echo "hddVersionCLN='${lndVersion}'" + echo "hddVersionCLN='${clnVersion}'" + echo "hddVersionLND='${lndVersion}'" elif [ ${isMyNodeHDD} -gt 0 ]; then hddGotMigrationData="mynode" elif [ ${isCitadelHDD} -gt 0 ]; then From 7f7a648881e2208f239c519b05294248b59d07cb Mon Sep 17 00:00:00 2001 From: rootzoll Date: Sun, 21 May 2023 23:15:31 +0200 Subject: [PATCH 2/2] #3858 adapt to new lnd conf name --- home.admin/config.scripts/blitz.migration.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home.admin/config.scripts/blitz.migration.sh b/home.admin/config.scripts/blitz.migration.sh index 16db73f19..2af557619 100755 --- a/home.admin/config.scripts/blitz.migration.sh +++ b/home.admin/config.scripts/blitz.migration.sh @@ -108,11 +108,12 @@ migrate_raspiblitz_conf () { if [ "$1" = "migration-umbrel" ]; then + # make sure data drive is not (regular) mounted source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status) if [ "${isMounted}" == "1" ]; then source <(sudo /home/admin/config.scripts/blitz.datadrive.sh unmount) fi - # make sure data drive is mounted + # make sure data drive is temp-mounted source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status) if [ "${isMounted}" != "1" ]; then 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 echo "### LND ###" 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 lndExists=$(sudo ls /mnt/hdd/umbrel/app-data/lightning/data/lnd/lnd.conf | grep -c "lnd.conf") if [ "${lndExists}" == "1" ]; then