}
-m() { if $verbose; then printf "$pre %s\n" "$*"; fi; "$@"; }
-die() { printf "$pre %s\n" "$*" >&2; exit 1; }
+pre="${0##*/}: "
+m() { if $verbose; then printf "$pre%s\n" "$*"; fi; "$@"; }
+e() { printf "$pre%s\n" "$*"; "$@"; }
+die() { printf "$pre%s\n" "$*" >&2; exit 1; }
# latest $MAIL_HOST
if [[ -e /b/bash_unpublished/source-state ]]; then
sleep 5
fi
-pre="${0##*/}:"
cron=false
orig_args=("$@")
temp=$(getopt -l cron,pull-reexec,help cl:m:npqs:t:vh "$@") || usage 1
fi
if $verbose; then
- printf "$pre options: conf_only=%s\ndry_run=%s\nrate_limit=%s\nverbose=%s\ncmd_arg=%s" "$conf_only" "$dry_run" "$rate_limit" "$verbose" "$cmd_arg"
+ 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"
fi
### end options parsing
targets=($home kw)
;;
tp)
- targets=(frodo kd)
+ # kd disabled temporarily while its hot and i plan to work on it.
+ #targets=(frodo kd)
+ targets=(frodo x3.b8.nz)
# might not be connected to the vpn
if timeout -s 9 10 ssh kw :; then
targets+=(kw)
# ;;
*)
prospective_mps=(/a /q)
- if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
- prospective_mps+=(/o)
+ if [[ $source ]]; then
+ source_state="$(ssh $source cat /a/bin/bash_unpublished/source-state)"
+ eval "$source_state"
+ source_host="$(ssh $source cat /etc/hostname)"
+ if [[ $source_host == "$MAIL_HOST" ]]; then
+ prospective_mps+=(/o)
+ fi
+ else
+ if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
+ prospective_mps+=(/o)
+ fi
fi
;;
esac
for mp in ${prospective_mps[@]}; do # default mountpoints to sync
if [[ -e /nocow/btrfs-stale/$mp ]]; then
- echo "$pre warning: $mp stale, not adding to default mountpoints"
+ e "warning: $mp stale, not adding to default mountpoints"
continue
fi
if awk '{print $2}' /etc/fstab | grep -xF $mp &>/dev/null; then
tmpf=$(mktemp)
scp $source:/a/bin/distro-setup/btrbk-run $tmpf
if ! diff -q $tmpf $BASH_SOURCE; then
- echo "$pre found newer version on host $source. reexecing"
+ e "found newer version on host $source. reexecing"
install -T $tmpf /usr/local/bin/btrbk-run
m /usr/local/bin/btrbk-run --pull-reexec "${orig_args[@]}"
exit
min_idle_ms=$((1000 * 60 * 15))
for h in ${targets[@]}; do
if zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z"); then
- if $cron && DISPLAY=:0 xprintidle; then
- # This is a separate ssh because xprintidle can fail and thats ok.
- # Ignore this host. i sometimes use a non-main machine for testing or web browsing, knowing that
- # everything will be wiped by the next backup, but I dont want it to happen as Im using
- # it from cronjob.
- continue
+ # This is a separate ssh because xprintidle can fail and thats ok.
+ if $cron && idle_ms=$(ssh $h DISPLAY=:0 xprintidle); then
+ if (( idle_ms < min_idle_ms )); then
+
+ # Ignore this host. i sometimes use a non-main machine for
+ # testing or web browsing, knowing that everything will be wiped
+ # by the next backup, but I dont want it to happen as Im using
+ # it from cronjob.
+ e "warning: $h: active X session in the last 15 minutes, skipping for now"
+ continue
+ fi
fi
sshable+=($h)
if [[ $zone != $local_zone ]]; then
else
if [[ $sshfail ]]; then
ret=1
- echo "$pre error: failed to ssh to ${sshfail[*]} but continuing with other hosts"
+ e "error: failed to ssh to ${sshfail[*]} but continuing with other hosts"
fi
targets=(${sshable[@]})
fi