iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
important fix
[distro-setup]
/
switch-mail-host
diff --git
a/switch-mail-host
b/switch-mail-host
index 180b963c6b2f1da82955406864d74f217ebf9292..0132819ba491fddd6299c7bca20d357d5d4149ee 100644
(file)
--- 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:
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:
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
}
fi
}
@@
-61,7
+61,7
@@
fi
mail_only=false
host2_only=false
force=false
mail_only=false
host2_only=false
force=false
-mp_args="-m /o,/a,/ar,/q,/qr"
+mp_args="-m /o,/a,/ar,/q,/q
d,/q
r"
temp=$(getopt -l force,help aioh "$@") || usage 1
eval set -- "$temp"
while true; do
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
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,/q
d,/q
r"
fi
if ! $force; then
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
########### 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
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
restore_old_btrbk=true
fi
@@
-260,10
+260,9
@@
fi
if $host2_only; then
if [[ $old_hostname != "$MAIL_HOST" && $old_hostname != kd ]]; then
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
fi
- m $new_shell systemctl --now enable btrbk.timer
btrbk-spread.timer || (( $? == 5 ))
+ m $new_shell systemctl --now enable btrbk.timer
exit 0
fi
exit 0
fi