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

diff --git a/switch-mail-host b/switch-mail-host
old mode 100755
new mode 100644
index 0cc8c0b..d71d4a8
--- 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
@@ -139,12 +142,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