various important fixes and improvements

[distro-setup] / switch-mail-host

diff --git a/switch-mail-host b/switch-mail-host
index 61e8966f52aa3fa25ae84e4992e16a24e8e164ea..40cb8172ffd873deda5097e966903243e6b636c2 100755 (executable)
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -37,20 +37,27 @@ fi
 
 if [[ $new_host == "$HOSTNAME" ]]; then
     localhost_new=true
-    ssh_prefix=ssh
+    new_shell="ssh $new_host"
 else
     localhost_new=false
-    ssh_prefix=
+    new_shell=
 fi
+
+old_shell=
+if [[ $old_host == "$HOSTNAME" ]]; then
+    old_shell="ssh $old_host"
+fi
+
 if [[ ! $new_host || ! $old_host ]]; then
     echo "$0: bad args. see script"
     exit 1
 fi
 
 at_home=false
-if timeout -s 9 10 ssh root@wrt.lan :; then
+if [[ $HOSTNAME == treetowl ]] || [[ $HOSTNAME == frodo ]] || timeout -s 9 5 ssh wrt.lan :; then
     at_home=true
 fi
+echo "$0: at_home = $at_home"
 
 source /a/bin/bash_unpublished/source-semi-priv
 #### begin convert private hostnames to public hostnames ####
@@ -67,18 +74,46 @@ fi
 
 
 # because our port forward is not robust enough, we can't use proxy command,
-# todo: just open an ssh port to the world on wrt
+# todo: just open an ssh port to the world on wrt.lan
 if ! $at_home; then
-    ssh_cmd="ssh $HOME_DOMAIN ssh wrt"
+    wrt_shell="ssh $HOME_DOMAIN ssh wrt.lan"
 else
-    ssh_cmd="ssh wrt"
+    wrt_shell="ssh wrt.lan"
+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
+
+########### end initial processing, begin actually modifying things ##########
+
+restore_new_btrbk=false
+if $new_shell systemctl is-active btrbk.timer; then
+    $new_shell sudo systemctl stop btrbk.timer
+    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
+    restore_old_btrbk=true
+fi
+
+$new_shell bash -s <<'EOF'
+set -eE
+if mountpoint /m; then sudo umount /m; fi
+if mountpoint /o; then sudo umount /o; fi
+EOF
+
 # if new_host is not on home network, make mail.iankelling.org not resolve
 # on the home network.
 if [[ $new_host == $HOSTNAME ]] && ! $at_home; then
-    echo | $ssh_cmd cedit mail_host /etc/hosts
+    echo | $wrt_shell cedit mail_host /etc/hosts || [[ $? == 1 ]] # 1 means file changed.
 else
-    $ssh_cmd bash -s <<EOFOUTER
+    $wrt_shell bash -s <<EOFOUTER
     cedit mail_host /etc/hosts <<'EOF' || /etc/init.d/dnsmasq restart
 \$(grep "\b$new_host\b" /etc/hosts | awk '{print $1}') mail.iankelling.org
 EOF
@@ -91,7 +126,7 @@ mail-setup() {
     $shell /a/bin/distro-setup/mail-setup exim4
 }
 
-mail-setup "ssh $old_host"
+mail-setup "$old_shell"
 
 sudo dd of=/etc/btrbk.conf <<'EOF'
 ssh_identity /root/.ssh/id_rsa
@@ -145,6 +180,13 @@ EOF
 
 
 sudo btrbk --progress run
-$ssh_prefix $new_host mount-latest-subvol
+$new_shell mount-latest-subvol
 
 mail-setup
+
+if $restore_new_btrbk; then
+    $new_shell sudo systemctl start btrbk.timer
+fi
+if $restore_old_btrbk; then
+    $old_shell sudo systemctl start btrbk.timer
+fi