iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor lists updates
[distro-setup]
/
btrbk-run
diff --git
a/btrbk-run
b/btrbk-run
index 5d020d773d0229cdbfbbeb75a5ead04af1b9f1c8..51c2ed6abaaf648397922e67ba0e86859b4b9a4e 100644
(file)
--- a/
btrbk-run
+++ b/
btrbk-run
@@
-63,7
+63,13
@@
conf_only=false
dry_run=false # mostly for testing
rate_limit=no
verbose=true; verbose_arg=-v
dry_run=false # mostly for testing
rate_limit=no
verbose=true; verbose_arg=-v
-progress_arg="--progress"
+if [[ $INVOCATION_ID ]]; then
+ # INVOCATION_ID means running as a systemd service. we cant show progress in this case,
+ # but if we pass the arg, it will insert mbuffer into the command.
+ progress_arg=
+else
+ progress_arg="--progress"
+fi
incremental_strict=false
pull_reexec=false
incremental_strict=false
pull_reexec=false
@@
-102,8
+108,8
@@
while true; do
# Comma separated mountpoints to backup. This has defaults set below.
-m) IFS=, mountpoints=($2); unset IFS; shift 2 ;;
-n) dry_run=true; dry_run_arg=-n; shift ;;
# Comma separated mountpoints to backup. This has defaults set below.
-m) IFS=, mountpoints=($2); unset IFS; shift 2 ;;
-n) dry_run=true; dry_run_arg=-n; shift ;;
- #
show
progress
- -p) progress_arg=
"--progress"
; shift ;;
+ #
hide
progress
+ -p) progress_arg=; shift ;;
# internal option for rerunning under newer SOURCE_HOST version.
--pull-reexec) pull_reexec=true; shift ;;
# quiet
# internal option for rerunning under newer SOURCE_HOST version.
--pull-reexec) pull_reexec=true; shift ;;
# quiet
@@
-131,7
+137,7
@@
done
cmd_arg=${1:-run}
cmd_arg=${1:-run}
-std_preserve="
18
h 14d 8w 24m"
+std_preserve="
36
h 14d 8w 24m"
q_preserve="18h 14d"
case $cmd_arg in
q_preserve="18h 14d"
case $cmd_arg in
@@
-196,7
+202,8
@@
if [[ ! -v targets && ! $source ]]; then
at_work=false
at_work=false
- targets=(frodo.b8.nz)
+ # todo, fix this up once frodo is back
+ # targets=(frodo.b8.nz)
case $HOSTNAME in
x2|kw)
at_work=true
case $HOSTNAME in
x2|kw)
at_work=true
@@
-218,10
+225,13
@@
if [[ ! -v targets && ! $source ]]; then
home=b8.nz
fi
;;&
home=b8.nz
fi
;;&
+ x2)
+ targets+=($home)
+ ;;
kw)
targets+=($home x2.office.fsf.org)
;;
kw)
targets+=($home x2.office.fsf.org)
;;
- x
2|x
3|sy|bo)
+ x3|sy|bo)
targets+=($home)
if $at_work; then
targets+=(x2.office.fsf.org x2.b8.nz)
targets+=($home)
if $at_work; then
targets+=(x2.office.fsf.org x2.b8.nz)
@@
-230,12
+240,21
@@
if [[ ! -v targets && ! $source ]]; then
fi
;;
kd)
fi
;;
kd)
- targets+=(x2wg.b8.nz x3.b8.nz)
+ if ping -q -c1 -w1 x2.office.fsf.org &>/dev/null; then
+ targets+=(x2.office.fsf.org)
+ else
+ targets+=(x2wg.b8.nz)
+ fi
if ping -q -c1 -w1 sy.b8.nz &>/dev/null; then
targets+=(sy.b8.nz)
else
targets+=(syw.b8.nz)
fi
if ping -q -c1 -w1 sy.b8.nz &>/dev/null; then
targets+=(sy.b8.nz)
else
targets+=(syw.b8.nz)
fi
+ if ping -q -c1 -w1 x3.b8.nz &>/dev/null; then
+ targets+=(x3.b8.nz)
+ else
+ targets+=(x3w.b8.nz)
+ fi
;;
frodo)
# no targets
;;
frodo)
# no targets
@@
-279,19
+298,19
@@
else
if [[ $source_host == "$MAIL_HOST" ]]; then
prospective_mps+=(/o)
fi
if [[ $source_host == "$MAIL_HOST" ]]; then
prospective_mps+=(/o)
fi
+ if [[ $source_host == "$HOST2" ]]; then
+ prospective_mps+=(/a /ar /qr /q)
+ fi
else
if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
else
if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
- # HOST2 is really the mail host if it exists
- if [[ $HOST2 && $HOST2 != "$HOSTNAME" ]]; then
- echo "skipping /o because HOST2 is not us"
- else
- prospective_mps+=(/o)
- fi
+ prospective_mps+=(/o)
+ fi
+ if [[ $HOSTNAME == "$HOST2" ]]; then
+ prospective_mps+=(/a /ar /qr /q)
fi
fi
# note: put q last just in case its specific retention options were to
# affect other config sections. I havent tested if that is the case.
fi
fi
# note: put q last just in case its specific retention options were to
# affect other config sections. I havent tested if that is the case.
- prospective_mps+=(/a /ar /qr /q)
;;
esac
fi
;;
esac
fi