various fixes and mail improvements

[distro-setup] / switch-mail-host

diff --git a/switch-mail-host b/switch-mail-host
index 13209a2164e4eec951dcc9dc6a76e7a3be07b299..d71d4a8ce4340ab3f57bb8b9f06a84ca89ae3683 100644 (file)
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -41,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 "
@@ -74,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
@@ -142,8 +142,6 @@ EOF
 
 $old_shell primary-setup $new_hostname
 
-/a/bin/distro-setup/install-my-scripts
-
 if $localhost_new; then
   btrbk-run -s $old_host $mp_args
 else