X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=btrbk-run;h=04a71a82da4c18db673c79bae3e7c2c9573b6150;hp=3a2d2a493495fb2fc422f02b9f5f80b52c632b39;hb=a1ebefe19ab910d20fad0c2fd88637fee23dee7c;hpb=7f759d320592e791a62cd0a966350e8c53ee0976

diff --git a/btrbk-run b/btrbk-run
index 3a2d2a4..04a71a8 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -66,6 +66,7 @@ dry_run=false # mostly for testing
 rate_limit=no
 verbose=true; verbose_arg=-v
 progress_arg="--progress"
+incremental_strict=true
 pull_reexec=false
 
 default_args_file=/etc/btrbk-run.conf
@@ -79,7 +80,7 @@ fi
 
 cron=false
 orig_args=("$@")
-temp=$(getopt -l cron,pull-reexec,help cl:m:npqs:t:vh "$@") || usage 1
+temp=$(getopt -l cron,pull-reexec,help cil:m:npqs:t:vh "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
@@ -90,6 +91,7 @@ while true; do
       ;;
     # only creates the config file, does not run btrbk
     -c) conf_only=true; shift ;;
+    -i) incremental_strict=false; shift ;;
     # bytes per second, suffix k m g
     -l) rate_limit=$2; shift 2 ;;
     # Comma separated mountpoints to backup. This has defaults set below.
@@ -131,6 +133,10 @@ if $verbose; then
 fi
 ### end options parsing
 
+if ! btrbk --version |& grep 0.29.0 >/dev/null; then
+  cd /a/opt/btrbk
+  m sudo make install
+fi
 
 # TODO: i wonder if there should be an option to send to the default
 # targets, plus any given on the command line.
@@ -150,8 +156,8 @@ if [[ ! -v targets && ! $source ]]; then
       ;;&
     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
+          && ip n show 192.168.0.26 | grep . &>/dev/null; then
+        at_work=true
       fi
       ;;&
     kw|x2|x3)
@@ -162,7 +168,7 @@ if [[ ! -v targets && ! $source ]]; then
       fi
       ;;&
     kw)
-      targets=($home x2)
+      targets=($home x3)
       ;;
     x2|x3)
       targets=($home kw)
@@ -370,9 +376,11 @@ target_preserve_min 4h
 rate_limit $rate_limit
 EOF
 
-
-
-
+if $incremental_strict; then
+  cat >>/etc/btrbk.conf <<EOF
+incremental strict
+EOF
+fi
 
 vol=/mnt/root
 for m in ${mountpoints[@]}; do