X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=0132819ba491fddd6299c7bca20d357d5d4149ee;hb=c5021d1e8ad29f946b28d7a22d959e691e28bf32;hp=180b963c6b2f1da82955406864d74f217ebf9292;hpb=41f86175362f77466ee147ca9c0b84976de94780;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
index 180b963..0132819 100644
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -37,11 +37,11 @@ restore_old_btrbk=false
 err-cleanup() {
   if $restore_new_btrbk; then
     e WARNING: due to failure, btrbk.timer may need manual restoration:
-    e $new_shell systemctl start btrbk.timer btrbk-spread.timer  || (( $? == 5 ))
+    e $new_shell systemctl start btrbk.timer
   fi
   if $restore_old_btrbk; then
     e WARNING: due to failure, btrbk.timer may need manual restoration:
-    e $old_shell systemctl start btrbk.timer btrbk-spread.timer  || (( $? == 5 ))
+    e $old_shell systemctl start btrbk.timer
   fi
 }
 
@@ -61,7 +61,7 @@ fi
 mail_only=false
 host2_only=false
 force=false
-mp_args="-m /o,/a,/ar,/q,/qr"
+mp_args="-m /o,/a,/ar,/q,/qd,/qr"
 temp=$(getopt -l force,help aioh "$@") || usage 1
 eval set -- "$temp"
 while true; do
@@ -143,7 +143,7 @@ esac
 if $mail_only; then
   mp_args="-m /o"
 elif $host2_only; then
-  mp_args="-m /a,/ar,/q,/qr"
+  mp_args="-m /a,/ar,/q,/qd,/qr"
 fi
 
 if ! $force; then
@@ -167,11 +167,11 @@ fi
 ########### end initial processing, begin actually modifying things ##########
 
 if $new_shell systemctl is-active btrbk.timer; then
-  m $new_shell systemctl stop btrbk.timer btrbk-spread.timer || (( $? == 5 ))
+  m $new_shell systemctl stop btrbk.timer
   restore_new_btrbk=true
 fi
 if $old_shell systemctl is-active btrbk.timer; then
-  m $old_shell systemctl stop btrbk.timer btrbk-spread.timer || (( $? == 5 ))
+  m $old_shell systemctl stop btrbk.timer
   restore_old_btrbk=true
 fi
 
@@ -260,10 +260,9 @@ fi
 
 if $host2_only; then
   if [[ $old_hostname != "$MAIL_HOST" && $old_hostname != kd ]]; then
-    # most systems dont have btrbk-spread, systemctl exits 5 on unknown unit
-    m $old_shell systemctl --now disable btrbk.timer btrbk-spread.timer || (( $? == 5 ))
+    m $old_shell systemctl --now disable btrbk.timer
   fi
-  m $new_shell systemctl --now enable btrbk.timer btrbk-spread.timer  || (( $? == 5 ))
+  m $new_shell systemctl --now enable btrbk.timer
   exit 0
 fi