restore_old_btrbk=false
cleanup() {
if $restore_new_btrbk; then
- $new_shell sudo systemctl start btrbk.timer
+ m $new_shell sudo systemctl start btrbk.timer
fi
if $restore_old_btrbk; then
- $old_shell sudo systemctl start btrbk.timer
+ m $old_shell sudo systemctl start btrbk.timer
fi
}
_errcatch_cleanup=cleanup # used by sourced err
new_host=$2
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 "
+if [[ $old_host != "$MAIL_HOST" ]]; then
+ read -r -p "warning: \$old_host != \$MAIL_HOST: $old_host != $MAIL_HOST, proceed? y/N "
if [[ $REPLY != [yY] ]]; then
exit 1
fi
exit 1
fi
-
-source /a/bin/bash_unpublished/source-state
-
-
+e $new_shell hostname
new_hostname=$($new_shell hostname)
########### end initial processing, begin actually modifying things ##########
fi
btrbk_test="systemctl is-active btrbk.service"
-while [[ $($new_shell $btrbk_test) != inactive ]] || [[ $($old_shell $btrbk_test) != inactive ]]; do
- echo "$0: btrbk is running on new or old host. sleeping for 8 seconds"
- sleep 6
- echo "$0: testing for btrbk activity in 2 seconds"
- sleep 2
+while true; do
+ for shell in "$new_shell" "$old_shell"; do
+ e $shell $btrbk_test
+ status=$($shell $btrbk_test) ||:
+ case $status in
+ inactive|failed) : ;;
+ *)
+ e "btrbk active on shell:$shell, status:$status, sleeping 8 seconds"
+ sleep 8
+ continue
+ ;;
+ esac
+ done
+ break
done
# ensure these are unused before doing anything