X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=btrbk-run;h=48550db1a4b2793418501cbfa32a1b234d538994;hp=a28bfac973e592c3750b5078b1fdeaf605edddea;hb=HEAD;hpb=45341164894a4765fba78cb4465ebe13707fe70c

diff --git a/btrbk-run b/btrbk-run
index a28bfac..8fc4c4f 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -77,6 +77,7 @@ set-location() {
     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
@@ -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
@@ -370,11 +379,11 @@ if [[ ! -v targets && ! $source ]]; then
     )
     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
@@ -384,7 +393,7 @@ if [[ ! -v targets && ! $source ]]; then
       fi
     done
   else
-    targets+=(i.b8.nz)
+    targets+=(b8.nz)
   fi
 fi
 
@@ -612,7 +621,7 @@ df --output=size,pcent / | tail -n1"
     min_root_kb=$(( 1024 * 1024 * 200 )) # 200 gb
     tmp=$(( root_size < min_root_kb ))
     if (( tmp )); then
-      e "warning: $h: root_size=$root_zie < 200gb, perhaps it is booted to bootstrap vol. skipping for now"
+      e "warning: $h: root_size=$root_size < 200gb, perhaps it is booted to bootstrap vol. skipping for now"
       continue
     fi