various improvements

[distro-setup] / switch-mail-host

diff --git a/switch-mail-host b/switch-mail-host
old mode 100755 (executable)
new mode 100644 (file)
index 0cc8c0b..199c16d
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -11,6 +11,7 @@ Adjust home network dns so NEW_HOST resolves locally if it is on the
 local network.  Turn off mail receiving on OLD_HOST, run btrbk to move
 mail to NEW_HOST, turn on mail receiving on NEW_HOST.
 
+-o         Only btrbk /o, instead of all filesystems.
 -w         Don't try to ssh to wrt. Should only be used in unusual network situation.
 -h|--help  Print help and exit.
 
@@ -22,10 +23,12 @@ EOF
 ##### begin command line parsing ########
 
 update_wrt=true # default
-temp=$(getopt -l help wh "$@") || usage 1
+temp=$(getopt -l help owh "$@") || usage 1
+mp_args=
 eval set -- "$temp"
 while true; do
   case $1 in
+    -o) mp_args="-m /o"; shift ;;
     -w) update_wrt=false; shift ;;
     -h|--help) usage ;;
     --) shift; break ;;
@@ -38,7 +41,7 @@ done
 
 old_host=$1
 new_host=$2
-source /a/bin/bash_unpublished/source-semi-priv
+source /a/bin/bash_unpublished/source-state
 
 if [[ $old_host != $MAIL_HOST ]]; then
   read -p "warning: \$old_host != \$MAIL_HOST: $old_host != $MAIL_HOST, proceed? y/N "
@@ -71,7 +74,7 @@ if timeout -s 9 5 ssh-keyscan -p 2220 -t rsa 10.0.0.1 2>/dev/null | grep -qFx '[
 fi
 echo "$0: at_home = $at_home"
 
-source /a/bin/bash_unpublished/source-semi-priv
+source /a/bin/bash_unpublished/source-state
 #### begin convert private hostnames to public hostnames ####
 #if ! $at_home; then
 #    for var in old_host new_host; do
@@ -93,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 ##########
@@ -108,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
@@ -139,12 +144,10 @@ EOF
 
 $old_shell primary-setup $new_hostname
 
-/a/bin/distro-setup/install-my-scripts
-
 if $localhost_new; then
-  btrbk-run -s $old_host -m /o
+  btrbk-run -s $old_host $mp_args
 else
-  btrbk-run -t $new_host -m /o
+  btrbk-run -t $new_host $mp_args
 fi
 
 $new_shell primary-setup $new_hostname