conflink detect systemd changes, better btrbk for roaming laptops

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index bfb2080778699b17b816737170a2c7a33cf7f1eb..10bd6382c65df24a4ec1efe35a45270e70ad9005 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -138,9 +138,21 @@ if [[ ! -v targets && ! $source ]]; then
     echo "MAIL_HOST=$MAIL_HOST, nothing to do"
     exit 0
   fi
+
+  at_work=false
+
   case $HOSTNAME in
-    kw|x2)
-      if ping -q -c1 -w1 iank.vpn.office.fsf.org &>/dev/null; then
+    kw)
+      at_work=true
+      ;;&
+    x2|x3)
+      if ping -q -c1 -w1 hal.office.fsf.org \
+              && ip n show 192.168.0.26 | grep . &>/dev/null; then
+      at_work=true
+      fi
+      ;;&
+    kw|x2|x3)
+      if $at_work && ping -q -c1 -w1 iank.vpn.office.fsf.org &>/dev/null; then
         home=iank.vpn.office.fsf.org
       else
         home=b8.nz
@@ -149,12 +161,9 @@ if [[ ! -v targets && ! $source ]]; then
     kw)
       targets=($home x2)
       ;;
-    x2)
+    x2|x3)
       targets=($home kw)
       ;;
-    x3)
-      targets=($home)
-      ;;
     tp)
       # kd disabled temporarily while its hot and i plan to work on it.
       #targets=(frodo kd)