mostly t11 fixes

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index 8a310e61e931e495ef0700c64128e56dac1fab9e..1b6cec5406802048fbeb1583ddf569867dd87e16 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -26,7 +26,7 @@ source /usr/local/lib/err
 
 usage() {
   cat <<'EOF'
-btrbk-run [OPTIONS]
+btrbk-run [OPTIONS] [run|resume|archive]
 usually -t TARGET_HOST or -s SOURCE_HOST
 
 Note, at source location, intentionally not executable, run and read
@@ -76,7 +76,6 @@ if [[ -s $default_args_file ]]; then
   sleep 5
 fi
 
-marchive=false
 early=false
 cron=false
 orig_args=("$@")
@@ -129,7 +128,6 @@ while true; do
   esac
 done
 
-# only tested commands are resume and archive
 cmd_arg=${1:-run}
 
 
@@ -137,9 +135,16 @@ std_preserve="18h 14d 8w 24m"
 q_preserve="18h 14d"
 
 case $cmd_arg in
-  run|resume|archive) : ;;
-  marchive)
-    marchive=true
+  run|resume) : ;;
+
+  # This works better than the normal archive command. We have to
+  # specify the mount points, but that is what we are used to doing and
+  # we prefer it. Another difference is that archive works recursively
+  # and we don't care about that. Sometimes we may still want to run
+  # btrbk archive, but it doesn't even use the config file, so just
+  # run it directly, eg:
+  # time s btrbk -v archive /mnt/r7/amy/boot/btrbk ssh://bo/mnt/boot2/btrbk
+  archive)
     cmd=resume
     std_preserve="999h 999d 999w 999m"
     q_preserve="$std_preserve"
@@ -163,8 +168,6 @@ if $verbose; then
 fi
 ### end options parsing
 
-declare -A vols
-
 # remove path from earlier version of btrbk
 rm -f /usr/sbin/btrbk
 # note, this still works as intended if there is no /usr/bin/btrbk
@@ -355,7 +358,11 @@ local_zone=$(date +%z)
 
 if [[ $source ]]; then
   if ! zone=$(ssh root@$source date +%z); then
-    die failed to ssh to root@$source
+    if $conf_only; then
+      echo "$0: warning: failed to ssh to root@$source"
+    else
+      die failed to ssh to root@$source
+    fi
   fi
   if [[ $zone != "$local_zone" ]]; then
     die "error: dont confuse yourself with multiple time zones. $h has different timezone than localhost"
@@ -375,36 +382,41 @@ else
       if (( ${#remote_info[@]} != 3 )); then
         die "error: didnt get 3 fields in test ssh to target $h. investigate"
       fi
+    elif $conf_only; then
+      # Use some typical values in this case
+      root_size=$(( 1024 * 1024 * 2000 )) #2tb
+      percent_used=10
+      zone=$(date +%z)
+    else
+      sshfail+=($h)
+      continue
+    fi
 
+    # we may be booted into a bootstrap fs or something
+    min_root_kb=$(( 1024 * 1024 * 200 )) # 200 gb
+    if (( root_size < min_root_kb )); then
+      continue
+    fi
 
-      # we may be booted into a bootstrap fs or something
-      min_root_kb=$(( 1024 * 1024 * 200 )) # 200 gb
-      if (( root_size < min_root_kb )); then
-        continue
-      fi
-
-      if (( percent_used >= 98 )); then
-        die "error: filesystem on target $h is $percent_used % full"
-      fi
+    if (( percent_used >= 98 )); then
+      die "error: filesystem on target $h is $percent_used % full"
+    fi
 
-      # This is a separate ssh because xprintidle can fail and thats ok.
-      if $cron && idle_ms=$(timeout -s 9 6 ssh $h DISPLAY=:0 xprintidle); then
-        if (( idle_ms < min_idle_ms )); then
+    # This is a separate ssh because xprintidle can fail and thats ok.
+    if $cron && idle_ms=$(timeout -s 9 6 ssh $h DISPLAY=:0 xprintidle); then
+      if (( idle_ms < min_idle_ms )); then
 
-          # Ignore this host. i sometimes use a non-main machine for
-          # testing or web browsing, knowing that everything will be wiped
-          # by the next backup, but I dont want it to happen as Im using
-          # it from cronjob.
-          e "warning: $h: active X session in the last 15 minutes, skipping for now"
-          continue
-        fi
-      fi
-      sshable+=($h)
-      if [[ $zone != "$local_zone" ]]; then
-        die "error: dont confuse yourself with multiple time zones. $h has different timezone than localhost"
+        # Ignore this host. i sometimes use a non-main machine for
+        # testing or web browsing, knowing that everything will be wiped
+        # by the next backup, but I dont want it to happen as Im using
+        # it from cronjob.
+        e "warning: $h: active X session in the last 15 minutes, skipping for now"
+        continue
       fi
-    else
-      sshfail+=($h)
+    fi
+    sshable+=($h)
+    if [[ $zone != "$local_zone" ]]; then
+      die "error: dont confuse yourself with multiple time zones. $h has different timezone than localhost"
     fi
   done
   if [[ ! ${sshable[*]} ]] || { ! $cron && [[ ${sshfail[*]} ]]; }; then
@@ -468,11 +480,9 @@ for m in ${mountpoints[@]}; do
   case $m in
     /o)
       vol=/mnt/o
-      vols[$vol]=t
       ;;
     *)
       vol=/mnt/root
-      vols[$vol]=t
       ;;
   esac
 
@@ -536,19 +546,6 @@ fi
 if $dry_run; then
   m btrbk -v -n $cmd_arg
   mexit 0
-elif [[ $cmd_arg == archive ]]; then
-  if [[ $source ]]; then
-    for vol in ${!vols[@]}; do
-      m btrbk $verbose_arg $progress_arg $cmd_arg ssh://$source$vol $vol
-    done
-  else
-    for tg in ${targets[@]}; do
-      for vol in ${!vols[@]}; do
-        m btrbk $verbose_arg $progress_arg $cmd_arg $vol ssh://$tg$vol
-      done
-    done
-  fi
-  mexit 0
 fi
 # -q and just using the syslog option seemed nice,
 # but it doesn't show when a send has a parent and when it doesn't.