iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
46bcc5c
)
fix switch-mail-host
author
Ian Kelling
<ian@iankelling.org>
Wed, 5 Jul 2023 00:13:43 +0000
(20:13 -0400)
committer
Ian Kelling
<ian@iankelling.org>
Wed, 5 Jul 2023 00:13:43 +0000
(20:13 -0400)
switch-mail-host
patch
|
blob
|
history
diff --git
a/switch-mail-host
b/switch-mail-host
index 577d50058570dce5f98219f48a8f37a3a8bf598c..180b963c6b2f1da82955406864d74f217ebf9292 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
+ e $new_shell systemctl start btrbk.timer
btrbk-spread.timer || (( $? == 5 ))
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
+ e $old_shell systemctl start btrbk.timer
btrbk-spread.timer || (( $? == 5 ))
fi
}
fi
}
@@
-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
+ m $new_shell systemctl stop btrbk.timer
btrbk-spread.timer || (( $? == 5 ))
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
+ m $old_shell systemctl stop btrbk.timer
btrbk-spread.timer || (( $? == 5 ))
restore_old_btrbk=true
fi
restore_old_btrbk=true
fi
@@
-260,9
+260,10
@@
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
- m $old_shell systemctl --now disable btrbk.timer
+ # most systems dont have btrbk-spread, systemctl exits 5 on unknown unit
+ m $old_shell systemctl --now disable btrbk.timer btrbk-spread.timer || (( $? == 5 ))
fi
fi
- m $new_shell systemctl --now enable btrbk.timer
+ m $new_shell systemctl --now enable btrbk.timer
btrbk-spread.timer || (( $? == 5 ))
exit 0
fi
exit 0
fi