From 1bfa2c2e3fedc54808bb56cefb46a8e2d4d22a7f Mon Sep 17 00:00:00 2001 From: rootzoll Date: Sat, 19 Jun 2021 03:13:01 +0200 Subject: [PATCH] adding lcd info --- home.admin/00infoLCD.sh | 2 +- home.admin/_background.sh | 2 +- home.admin/config.scripts/blitz.copychain.sh | 6 +++--- home.admin/setup.scripts/eventInfoWait.sh | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh index f36643533..823d8cd96 100755 --- a/home.admin/00infoLCD.sh +++ b/home.admin/00infoLCD.sh @@ -87,7 +87,7 @@ while : # get config info if already available (with state value) source ${infoFile} - if [ "${setupPhase}" != "done" ]; then + if [ "${setupPhase}" != "done" ] && [ "${state}" != "copytarget" ]; then # show status info during boot & setup & repair on LCD /home/admin/setup.scripts/eventInfoWait.sh "${state}" "${message}" lcd diff --git a/home.admin/_background.sh b/home.admin/_background.sh index 6fcfaed6d..e1fadd285 100755 --- a/home.admin/_background.sh +++ b/home.admin/_background.sh @@ -57,7 +57,7 @@ do # https://github.com/rootzoll/raspiblitz/issues/160 #################################################### - if [ "${state}" == "" ] || [ "${state}" == "copysource" ]; then + if [ "${state}" == "" ] || [ "${state}" == "copysource" ] || [ "${state}" == "copytarget" ]; then echo "skipping background loop (${counter}) - state(${state})" sleep 1 continue diff --git a/home.admin/config.scripts/blitz.copychain.sh b/home.admin/config.scripts/blitz.copychain.sh index 24743ef8e..b49c7c8d6 100644 --- a/home.admin/config.scripts/blitz.copychain.sh +++ b/home.admin/config.scripts/blitz.copychain.sh @@ -27,8 +27,8 @@ case $CHOICE in esac # setting copy state -sed -i "s/^state=.*/state=copysource/g" /home/admin/raspiblitz.info -sed -i "s/^message=.*/message='LAN-COPY Blockchain'/g" /home/admin/raspiblitz.info +sed -i "s/^state=.*/state=copytarget/g" /home/admin/raspiblitz.info +sed -i "s/^message=.*/message='Receiving Blockchain over LAN'/g" /home/admin/raspiblitz.info echo "stopping services ..." sudo systemctl stop lnd @@ -207,7 +207,7 @@ if [ ${quickCheckOK} -eq 0 ]; then response=$? echo "response(${response})" if [ "${response}" == "0" ]; then - /home/admin/50copyHDD.sh + /home/admin/config.scripts/blitz.copychain.sh exit 0 fi diff --git a/home.admin/setup.scripts/eventInfoWait.sh b/home.admin/setup.scripts/eventInfoWait.sh index 4cdd2d133..eb68d9288 100644 --- a/home.admin/setup.scripts/eventInfoWait.sh +++ b/home.admin/setup.scripts/eventInfoWait.sh @@ -88,6 +88,22 @@ ssh admin@${localip} Use your Password A " 7 41 +elif [ "${eventID}" == "copysource" ] && [ "${mode}" == "lcd" ]; then + + dialog --backtitle "${backtitle}" --cr-wrap --infobox " +Repair-Mode - Providing Blockchain +ssh admin@${localip} +Use your Password A +" 7 41 + +elif [ "${eventID}" == "copytarget" ] && [ "${mode}" == "lcd" ]; then + + dialog --backtitle "${backtitle}" --cr-wrap --infobox " +Receiving Blockchain over LAN +ssh admin@${localip} +Use your Password A +" 7 41 + elif [ "${eventID}" == "inconsistentsystem" ]; then dialog --backtitle "${backtitle}" --cr-wrap --infobox "