From 68d0092b4089218951aad4278bc0a0e63b8de31d Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Mon, 20 Sep 2021 00:12:36 +0200
Subject: [PATCH] #2553 fix change of bitcoind service

---
 home.admin/_bootstrap.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 0d28fa732..db623e7dd 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -641,12 +641,6 @@ if [ ${isMounted} -eq 0 ]; then
   # mark provision process done
   sed -i "s/^message=.*/message='Provision Done'/g" ${infoFile}
 
-  # make sure for future starts that blockchain service gets started after bootstrap
-  # so deamon reloas needed ... system will go into reboot after last loop
-  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
-
   # wait until syncProgress is available (neeed for final dialogs)
   while [ "${syncProgress}" == "" ]
   do
@@ -671,6 +665,13 @@ if [ ${isMounted} -eq 0 ]; then
     sed -i "s/^message=.*/message='Setup Done'/g" ${infoFile}
   fi
 
+  # make sure for future starts that blockchain service gets started after bootstrap
+  # so deamon reloas needed ... system will go into reboot after last loop
+  # needs to be after wait loop because otherwise the "restart" on COPY OVER LAN will not work
+  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
+
   source ${infoFile}
   echo "WAIT LOOP: FINAL SETUP .. see controlFinalDialog.sh" >> $logFile
   until [ "${state}" == "ready" ]