From a2656ac0adbcb80fccf512b093bdc759316245c7 Mon Sep 17 00:00:00 2001 From: rootzoll Date: Wed, 22 Sep 2021 19:56:15 +0200 Subject: [PATCH] try fix final reboot bug --- home.admin/00raspiblitz.sh | 3 ++- home.admin/_bootstrap.sh | 5 +++-- home.admin/config.scripts/bonus.rtl.sh | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh index ad10088dc..8cd4d7e4d 100755 --- a/home.admin/00raspiblitz.sh +++ b/home.admin/00raspiblitz.sh @@ -171,7 +171,8 @@ do # push to final setup gui dialogs #echo "# controlFinalDialog.sh" /home/admin/setup.scripts/controlFinalDialog.sh - continue + # exit for final setup reboot + exit 0 fi ##################################### diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh index a1db6a844..165e46376 100755 --- a/home.admin/_bootstrap.sh +++ b/home.admin/_bootstrap.sh @@ -548,7 +548,7 @@ if [ ${isMounted} -eq 0 ]; then source ${setupFile} cat ${setupFile} >> ${logFile} - # make sure basic info id in raspiblitz.info + # make sure basic info is in raspiblitz.info echo "# Update ${infoFile} " >> ${logFile} sudo sed -i "s/^network=.*/network=${network}/g" ${infoFile} sudo sed -i "s/^chain=.*/chain=${chain}/g" ${infoFile} @@ -666,7 +666,7 @@ if [ ${isMounted} -eq 0 ]; then fi source ${infoFile} - echo "WAIT LOOP: FINAL SETUP .. see controlFinalDialog.sh" >> $logFile + echo "WAIT LOOP: FINAL SETUP .. see controlFinalDialog.sh network(${network})" >> $logFile until [ "${state}" == "ready" ] do @@ -693,6 +693,7 @@ if [ ${isMounted} -eq 0 ]; then echo "# Updating service ${network}d.service ..." >> $logFile sudo sed -i "s/^Wants=.*/Wants=bootstrap.service/g" /etc/systemd/system/${network}d.service sudo sed -i "s/^After=.*/After=bootstrap.service/g" /etc/systemd/system/${network}d.service + sudo systemctl daemon-reload # delete setup data from RAM sudo rm ${setupFile} diff --git a/home.admin/config.scripts/bonus.rtl.sh b/home.admin/config.scripts/bonus.rtl.sh index b1d001b4b..3c0aba537 100755 --- a/home.admin/config.scripts/bonus.rtl.sh +++ b/home.admin/config.scripts/bonus.rtl.sh @@ -1,4 +1,5 @@ #!/bin/bash +# https://github.com/Ride-The-Lightning/RTL RTLVERSION="v0.11.2" # check and load raspiblitz config