updates, especially for etiona

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index 04a71a82da4c18db673c79bae3e7c2c9573b6150..68363821af2b1f695655805c83fe683d7f8102cc 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -176,16 +176,17 @@ if [[ ! -v targets && ! $source ]]; then
     tp)
       # kd disabled temporarily while its hot and i plan to work on it.
       #targets=(frodo kd)
-      targets=(frodo x3.b8.nz)
+      #targets=(frodo x2.b8.nz)
+      targets=(frodo)
       # might not be connected to the vpn
-      if timeout -s 9 10 ssh kw :; then
+      if timeout -s 9 6 ssh kw :; then
         targets+=(kw)
       fi
       ;;
     kd)
       targets=(frodo tp)
       # might not be connected to the vpn
-      if timeout -s 9 10 ssh kw :; then
+      if timeout -s 9 6 ssh kw :; then
         targets+=(kw)
       fi
       ;;
@@ -278,7 +279,6 @@ fi
 
 
 
-
 if ! which btrbk &>/dev/null; then
   die "error: no btrbk binary found"
 fi
@@ -306,7 +306,7 @@ else
   for h in ${targets[@]}; do
     if zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z"); then
       # This is a separate ssh because xprintidle can fail and thats ok.
-      if $cron && idle_ms=$(ssh $h DISPLAY=:0 xprintidle); then
+      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
@@ -449,7 +449,7 @@ if mountpoint $rsync_mountpoint >/dev/null; then
 fi
 
 if [[ $source ]]; then
-  m mount-latest-subvol $verbose_arg
+  m mount-latest-subvol
 else
   m /a/exe/mount-latest-remote ${targets[@]}
 fi