X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=577d50058570dce5f98219f48a8f37a3a8bf598c;hb=3ec598448bd33283d2d765eb46e85835915bf3a9;hp=ffff83e264dbce8b7e1034d85aea10a055711712;hpb=ec17ba8d0cabf1d03f7750406ac687873b12e7f0;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
index ffff83e..577d500 100644
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -10,6 +10,10 @@ Turn off mail receiving on OLD_HOST, run btrbk to move mail to NEW_HOST,
 turn on mail receiving on NEW_HOST.  Assumes we want to move all
 filesystems unless passing -o.
 
+-a         Avoid snapshot /a, /q, and similar. If we haven't
+           made any changes in the last hour, there is no
+           need to snapshot anything but /o, and we will
+           just do that once.
 -i         Disallow incremental backup.
 -o         Only btrbk /o, instead of all filesystems.
 --force    Run even though our local state does not say that MAIL_HOST is
@@ -58,10 +62,11 @@ mail_only=false
 host2_only=false
 force=false
 mp_args="-m /o,/a,/ar,/q,/qr"
-temp=$(getopt -l force,help ioh "$@") || usage 1
+temp=$(getopt -l force,help aioh "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
+    -a) snapshot_arg=resume ;;
     --force) force=true ;;
     -i) incremental_arg="-i" ;;
     -o)
@@ -141,15 +146,16 @@ elif $host2_only; then
   mp_args="-m /a,/ar,/q,/qr"
 fi
 
-
-if $host2_only; then
-  if [[ $old_hostname != "$HOST2" ]]; then
-    err "\$old_hostname($old_hostname) != \$HOST2($HOST2). Rerun with --force if you really want this."
+if ! $force; then
+  if $host2_only; then
+    if [[ $old_hostname != "$HOST2" ]]; then
+      err "\$old_hostname($old_hostname) != \$HOST2($HOST2). Rerun with --force if you really want this."
+      exit 1
+    fi
+  elif [[ $old_hostname != "$MAIL_HOST" ]]; then
+    err "\$old_hostname($old_hostname) != \$MAIL_HOST($MAIL_HOST). Rerun with --force if you really want this."
     exit 1
   fi
-elif [[ $old_hostname != "$MAIL_HOST" ]] && ! $force; then
-  err "\$old_hostname($old_hostname) != \$MAIL_HOST($MAIL_HOST). Rerun with --force if you really want this."
-  exit 1
 fi
 
 if [[ ! $new_host || ! $old_host ]]; then
@@ -241,7 +247,7 @@ EOF
 
 
 e Running initial btrbk
-m btrbk-run -v $bbk_args $incremental_arg $mp_args || ret=$?
+m btrbk-run -v $bbk_args $incremental_arg $mp_args $snapshot_arg || ret=$?
 if (( ret )); then
   err "failed initial btrbk"
   exit $ret