X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=btrbk-run;h=34b23a8af6a552d79672b55a0dc3b55b5cdc8186;hb=9a0f77b0495e6f2643d5646c54b4c99cf3118c67;hp=5ce774b7e83c84270ad228479e5ba7b0f1901c40;hpb=5a6e794f459b3e83b6d665e05d0ab0c8bc6cdfbe;p=distro-setup

diff --git a/btrbk-run b/btrbk-run
index 5ce774b..34b23a8 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -100,6 +100,8 @@ add-x3-target() {
   elif ping -q -c1 -w1 $h.b8.nz &>/dev/null; then
     # in case we took it home
     targets+=(x3.b8.nz)
+  elif ping -q -c1 -w1 ${h}w.b8.nz &>/dev/null; then
+    targets+=(x3w.b8.nz)
   else
     targets+=(x3wg.b8.nz)
   fi
@@ -333,6 +335,7 @@ if [[ /a/opt/btrbk/btrbk -nt /usr/bin/btrbk ]]; then
   fi
   cd /a/opt/btrbk
   m make install
+  cd /
 fi
 
 # TODO: i wonder if there should be an option to send to the default
@@ -400,17 +403,17 @@ else
             prospective_mps+=(/o)
           fi
           if [[ $source_host == "$HOST2" ]]; then
-            prospective_mps+=(/a /ar /qr /qd /q)
+            prospective_mps+=(/a /qr /qd /q)
           fi
         else
           if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
             prospective_mps+=(/o)
           fi
           if [[ $HOSTNAME == "$HOST2" ]]; then
-            prospective_mps+=(/a /ar /qr /qd /q)
+            prospective_mps+=(/a /qr /qd /q)
           fi
           if $kd_spread; then
-            prospective_mps=(/a /ar /o /qr /qd /q)
+            prospective_mps=(/a /o /qr /qd /q)
           fi
         fi
         # note: put q last just in case its specific retention options were to