lots of stuff lumped together

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index 97b83e026f55379fddfa3c08de2b98bc4952dce1..7a1d946c88f064eafae23ae27bccd53511114aad 100755 (executable)
--- a/btrbk-run
+++ b/btrbk-run
@@ -28,21 +28,32 @@ script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
 # note q is owned by root:1000
 # note p/m is owned 1000:1000 and chmod 700
 mountpoints=(/a)
-private_mountpoints=(/q /m)
+private_mountpoints=(/q)
 rsync_mountpoint=/q
 
 conf_only=false
 dry_run=false # mostly for testing
 resume_arg=
 do_i=true
+if [[ $HOSTNAME == $MAIL_HOST ]]; then
+    do_o=true
+else
+    do_o=false
+fi
+
+default_args_file=/etc/btrbk-run.conf
+if [[ -r $default_args_file ]]; then
+    set -- $(< $default_args_file) "$@"
+fi
 
-temp=$(getopt -l help hcinprt: "$@") || usage 1
+temp=$(getopt -l help hcinoprt: "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
         -c) conf_only=true; shift ;;
         -i) do_i=false; shift ;;
         -n) dry_run=true; dry_run_arg=-n; shift ;;
+        -o) do_o=false; shift ;;
         -p) progress_arg="--progress"; shift ;;
         # btrbk arg: Resume only. Skips snapshot creation.
         -r) resume_arg=-r; shift ;;
@@ -52,7 +63,11 @@ while true; do
         *) echo "$0: Internal error!" ; exit 1 ;;
     esac
 done
-read primary <<<"$@"
+
+if $do_o; then
+    private_mountpoints+=(/o)
+fi
+read primary <<<"$@" # not yet used
 
 ##### end command line parsing ########
 
@@ -144,10 +159,12 @@ if [[ ! $targets ]]; then
             targets=(frodo)
             ;;
     esac
-    echo "targets: ${targets[*]}"
 fi
 
 
+echo "targets: ${targets[*]}"
+
+
 # for i, we just do a 1 way sync from master to backup,
 # and manually manage any changes to that.
 i_possible=false