host info updates

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index 93e8dab79322bbbe8e4bea0fb14419718512e4e7..8fc4c4f00b8c9f5ea3b64126767c83003e675643 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -74,9 +74,10 @@ set-location() {
     kd|frodo)
       at_home=true
       ;;
-    x2|x3|sy)
+    x2|x3|sy|so)
       if [[ $(dig +short @10.2.0.1 -x 10.2.0.2 2>&1 ||:) == kd.b8.nz. ]] \
            && ip n show 10.2.0.1 | grep . &>/dev/null; then
+        # note: logic duplicated in 11-iank
         at_home=true
       elif ping -q -c1 -w1 hal.office.fsf.org &>/dev/null \
           && ip n show 192.168.0.26 | grep . &>/dev/null; then
@@ -92,7 +93,7 @@ exit-if-no-default-targets() {
     mexit 0
   fi
   case $HOSTNAME in
-    kw|kd|frodo|x2|x3|sy) : ;;
+    kw|kd|frodo|x2|x3|sy|so) : ;;
     *)
       die "error: no default targets for this host, use -t"
       ;;
@@ -113,12 +114,21 @@ add-x3-target() {
   fi
 }
 
-add-wireless-target-h() {
-  if ping -q -c1 -w1 $h.b8.nz &>/dev/null; then
-    targets+=($h.b8.nz)
-  elif ping -q -c1 -w1 ${h}w.b8.nz &>/dev/null; then
-    targets+=(${h}w.b8.nz)
+add-wireless-target() {
+  local host
+  if [[ ! $1 ]]; then
+    set -- $h
   fi
+  for host; do
+    # c = cabled, w = wireless
+    if ping -q -c1 -w1 ${host}c.b8.nz &>/dev/null; then
+      targets+=(${host}c.b8.nz)
+    elif ping -q -c1 -w1 $host.b8.nz &>/dev/null; then
+      targets+=($host.b8.nz)
+    elif ping -q -c1 -w1 ${host}w.b8.nz &>/dev/null; then
+      targets+=(${host}w.b8.nz)
+    fi
+  done
 }
 
 qconf() {
@@ -288,8 +298,7 @@ if $kd_spread; then
   fi
   cmd_arg=resume
   preserve_arg=-p
-  h=sy
-  add-wireless-target-h
+  add-wireless-target sy so
 fi
 
 if [[ ! $cmd_arg ]]; then
@@ -366,14 +375,15 @@ if [[ ! -v targets && ! $source ]]; then
     wireless_home_hosts=(
       x2
       sy
+      so
     )
     for h in ${wireless_home_hosts[@]}; do
       if [[ $HOSTNAME != "$h" ]]; then
-        add-wireless-target-h
+        add-wireless-target
       fi
     done
   elif $at_work; then
-    targets+=(i.b8.nz)
+    targets+=(b8.nz)
     for h in x2 x3 kw; do
       if [[ $HOSTNAME == "$h" ]]; then
         continue
@@ -383,7 +393,7 @@ if [[ ! -v targets && ! $source ]]; then
       fi
     done
   else
-    targets+=(i.b8.nz)
+    targets+=(b8.nz)
   fi
 fi
 
@@ -500,6 +510,7 @@ if $verbose; then
     for opt in ${opts_show[@]}; do
       if $first; then
         printf "%s" "$opt"
+        first=false
       else
         printf " %s" "$opt"
       fi
@@ -575,13 +586,17 @@ else
 
   sshable=()
   sshfail=()
+  remote_str_cmd="mkdir -p /mnt/root/btrbk /mnt/o/btrbk && \
+date +%z && \
+df --output=size,pcent / | tail -n1"
+
   for h in ${targets[@]}; do
     if $fast || $conf_only; then
       # Use some typical values in this case
       root_size=$(( 1024 * 1024 * 2000 )) #2tb
       percent_used=10
       zone=$(date +%z)
-    elif remote_str=$(timeout -s 9 6 ssh root@$h "mkdir -p /mnt/root/btrbk /mnt/o/btrbk && date +%z && df --output=size,pcent / | tail -n1"); then
+    elif remote_str=$(timeout -s 9 6 ssh root@$h "$remote_str_cmd"); then
       mapfile -t tmp_array <<<"$remote_str"
       zone="${tmp_array[0]}"
       IFS=" " read -r root_size percent_used <<<"${tmp_array[1]}"
@@ -606,6 +621,7 @@ else
     min_root_kb=$(( 1024 * 1024 * 200 )) # 200 gb
     tmp=$(( root_size < min_root_kb ))
     if (( tmp )); then
+      e "warning: $h: root_size=$root_size < 200gb, perhaps it is booted to bootstrap vol. skipping for now"
       continue
     fi
 
@@ -643,7 +659,7 @@ else
     fi
   done
   if [[ ! ${sshable[*]} ]] || { $force && [[ ${sshfail[*]} ]]; }; then
-    die "failed to ssh to hosts: ${sshfail[*]}"
+    die "see skipped host warning above or sshfail hosts: ${sshfail[*]}"
   else
     if [[ ${sshfail[*]} ]]; then
       ret=1
@@ -876,7 +892,8 @@ if [[ $ret == 0 ]]; then
       m ssh root@$tg 'btrbk-spread-wrap &>/dev/null </dev/null &'
     fi
     rsync --mkpath -a -f"- */" -f"+ *" /var/log/btrbk/ root@$tg:/var/log/btrbk/$tg
-    ssh root@$tg /usr/local/bin/mail-backup-clean
+    cmd=/usr/local/bin/mail-backup-clean
+    ssh root@$tg "if test -x $cmd; then $cmd; fi"
   done
   if [[ $source ]]; then
     rsync --mkpath -a -f"- */" -f"+ *" $source:/var/log/btrbk/ /var/log/btrbk/$source