various fixes

[distro-setup] / switch-mail-host

diff --git a/switch-mail-host b/switch-mail-host
index 199c16d1a736a3faba6452337689b95252cbd5ad..2d74ceb824d69ac62089b5491abdfad4db0424ba 100644 (file)
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -24,7 +24,7 @@ EOF
 
 update_wrt=true # default
 temp=$(getopt -l help owh "$@") || usage 1
-mp_args=
+mp_args="-m /o,/q,/a"
 eval set -- "$temp"
 while true; do
   case $1 in
@@ -142,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
@@ -150,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