early=false
cron=false
fast=false
+kd_spread_maybe=false
orig_args=("$@")
-temp=$(getopt -l cron,fast,pull-reexec,help 23ceil:m:npqrs:t:vh "$@") || usage 1
+temp=$(getopt -l cron,fast,pull-reexec,help 23ceikl:m:npqrs:t:vh "$@") || usage 1
eval set -- "$temp"
while true; do
case $1 in
# switch mail-host, no need to repeat the same checks again.
--fast) fast=true ;;
-i) incremental_strict=true ;;
+ # note this implies resume
+ -k) kd_spread_maybe=true ;;
# bytes per second, suffix k m g
-l) rate_limit=$2; shift ;;
# Comma separated mountpoints to backup. This has defaults set below.
shift
done
+if $kd_spread_maybe; then
+ if [[ $1 && $1 != resume ]]; then
+ die "dont pass -k without resume or empty run arg"
+ fi
+ cmd_arg=resume
+fi
+
+
cmd_arg=${1:-run}
die "error: -t and -s are mutually exclusive"
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"
-fi
### end options parsing
# remove path from earlier version of btrbk
if [[ ! -v targets && ! $source ]]; then
if $cron; then
if [[ $HOSTNAME != "$MAIL_HOST" ]]; then
- if [[ $HOSTNAME == kd && $MAIL_HOST == x3 ]]; then
+ if $kd_spread_maybe && [[ $HOSTNAME == kd && $MAIL_HOST == x3 ]]; then
if ping -q -c1 -w1 x3.office.fsf.org &>/dev/null; then
work_host=x3.office.fsf.org
elif ping -q -c1 -w1 x3wg.b8.nz &>/dev/null; then
esac
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"
+fi
+
+
if [[ -v targets ]]; then
echo "targets: ${targets[*]}"
fi
sshable=()
sshfail=()
- min_idle_ms=$((1000 * 60 * 15))
for h in ${targets[@]}; do
if $fast || $conf_only; then
# Use some typical values in this case
die "error: filesystem on target $h is $percent_used % full"
fi
- # This is a separate ssh because xprintidle can fail and thats ok.
- if $cron && idle_ms=$(timeout -s 9 6 ssh $h DISPLAY=:0 xprintidle); then
- if (( idle_ms < min_idle_ms )); then
-
+ # on sy, xprintidle is resetting every 12 seconds even when not
+ # idle, i dunno why, instead we are checking if the screen is locked,
+ # which is good enough.
+ #
+ # This is a separate ssh because the command can fail and thatis ok.
+ if $cron; then
+ locked=false
+ if lock_info=$(timeout -s 9 6 ssh $h DISPLAY=:0 xscreensaver-command -timer); then
+ if [[ $lock_info != *non-blanked* ]]; then
+ locked=true
+ fi
+ else
+ locked=true
+ fi
+ if $locked; 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"
+ e "warning: $h: seems to be actively in use, skipping for now"
continue
fi
fi