various fixes

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index 7070f20f900a392a27e0b22c66c5a1458241679f..df17880ed025497749c535431a640797eabf0422 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -35,6 +35,11 @@ EOF
   exit $1
 }
 
+# latest $MAIL_HOST
+if [[ -e /b/bash_unpublished/source-semi-priv ]]; then
+  source /b/bash_unpublished/source-semi-priv
+fi
+
 script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
 
 # note q is owned by root:1000
@@ -147,11 +152,6 @@ case $HOSTNAME in
     fi
     ;;
 esac
-case ${targets[0]} in
-  kw|kww)
-    prospective_mps=(/a)
-    ;;
-esac
 
 for mp in ${prospective_mps[@]}; do # default mountpoints to sync
   if [[ -e /nocow/btrfs-stale/$mp ]]; then
@@ -268,6 +268,7 @@ fi
 
 if $dry_run; then
   m btrbk -v -n $cmd_arg
+  exit 0
 elif [[ $cmd_arg == archive ]]; then
   if [[ $source ]]; then
     m btrbk $verbose_arg $progress_arg $cmd_arg ssh://$source$vol $vol