iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix race condition
[distro-setup]
/
btrbk-run
diff --git
a/btrbk-run
b/btrbk-run
index f964f6c72df830e2fa0b99599234a7527756dcd9..10bd6382c65df24a4ec1efe35a45270e70ad9005 100644
(file)
--- a/
btrbk-run
+++ b/
btrbk-run
@@
-125,7
+125,7
@@
if [[ -v targets && $source ]]; then
fi
if $verbose; then
fi
if $verbose; then
-
e
"options: conf_only=%s\ndry_run=%s\nrate_limit=%s\nverbose=%s\ncmd_arg=%s" "$conf_only" "$dry_run" "$rate_limit" "$verbose" "$cmd_arg"
+
printf
"options: conf_only=%s\ndry_run=%s\nrate_limit=%s\nverbose=%s\ncmd_arg=%s" "$conf_only" "$dry_run" "$rate_limit" "$verbose" "$cmd_arg"
fi
### end options parsing
fi
### end options parsing
@@
-138,9
+138,21
@@
if [[ ! -v targets && ! $source ]]; then
echo "MAIL_HOST=$MAIL_HOST, nothing to do"
exit 0
fi
echo "MAIL_HOST=$MAIL_HOST, nothing to do"
exit 0
fi
+
+ at_work=false
+
case $HOSTNAME in
case $HOSTNAME in
- kw|x2)
- if ping -q -c1 -w1 iank.vpn.office.fsf.org &>/dev/null; then
+ kw)
+ at_work=true
+ ;;&
+ 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
+ fi
+ ;;&
+ kw|x2|x3)
+ if $at_work && ping -q -c1 -w1 iank.vpn.office.fsf.org &>/dev/null; then
home=iank.vpn.office.fsf.org
else
home=b8.nz
home=iank.vpn.office.fsf.org
else
home=b8.nz
@@
-149,7
+161,7
@@
if [[ ! -v targets && ! $source ]]; then
kw)
targets=($home x2)
;;
kw)
targets=($home x2)
;;
- x2)
+ x2
|x3
)
targets=($home kw)
;;
tp)
targets=($home kw)
;;
tp)