X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=32642240dd17cf4e4978accfa2f4a27ea92cc14c;hb=460cc07230c2040305068f17a687e06c7bc13dfe;hp=d71d4a8ce4340ab3f57bb8b9f06a84ca89ae3683;hpb=f7eaad64a7c5f3bc851f146e1f258d34f398a7d7;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
index d71d4a8..3264224 100644
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -96,14 +96,6 @@ else
   wrt_shell="ssh wrt.b8.nz"
 fi
 
-btrbk_test="systemctl is-active btrbk.service"
-while $new_shell $btrbk_test || $old_shell $btrbk_test; do
-  echo "$0: btrbk is running on new or old host. sleeping for 8 seconds"
-  sleep 6
-  echo "$0: testing for btrbk activity in 2 seconds"
-  sleep 2
-done
-
 new_hostname=$($new_shell hostname)
 
 ########### end initial processing, begin actually modifying things ##########
@@ -111,14 +103,24 @@ new_hostname=$($new_shell hostname)
 restore_new_btrbk=false
 if $new_shell systemctl is-active btrbk.timer; then
   $new_shell sudo systemctl stop btrbk.timer
+  echo "$0: note: stopped btrbk.timer on $new_host"
   restore_new_btrbk=true
 fi
 restore_old_btrbk=false
 if $old_shell systemctl is-active btrbk.timer; then
   $old_shell sudo systemctl stop btrbk.timer
+  echo "$0: note: stopped btrbk.timer on $old_host"
   restore_old_btrbk=true
 fi
 
+btrbk_test="systemctl is-active btrbk.service"
+while [[ $($new_shell $btrbk_test) != inactive ]] || [[ $($old_shell $btrbk_test) != inactive ]]; do
+  echo "$0: btrbk is running on new or old host. sleeping for 8 seconds"
+  sleep 6
+  echo "$0: testing for btrbk activity in 2 seconds"
+  sleep 2
+done
+
 
 $new_shell bash -xs <<'EOF'
 set -eE
@@ -140,7 +142,7 @@ EOF
 # I think exim will try ipv6 first, so no need to disable
 # ipv6 i think.
 
-$old_shell primary-setup $new_hostname
+$old_shell /a/exe/primary-setup $new_hostname
 
 if $localhost_new; then
   btrbk-run -s $old_host $mp_args
@@ -148,7 +150,7 @@ else
   btrbk-run -t $new_host $mp_args
 fi
 
-$new_shell primary-setup $new_hostname
+$new_shell /a/exe/primary-setup $new_hostname
 
 if $restore_new_btrbk; then
   $new_shell sudo systemctl start btrbk.timer