bug fixes

diff --git a/btrbk-run b/btrbk-run
index 8d6eb285f20eecdff391d99101482325d1712fc3..31649a495cf7373fe9af900233c4fc0994813596 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -77,7 +77,7 @@ fi
 pre="${0##*/}:"
 cron=false
 orig_args=("$@")
-temp=$(getopt -l cpull-reexec,help cl:m:npqs:t:vh "$@") || usage 1
+temp=$(getopt -l cron,pull-reexec,help cl:m:npqs:t:vh "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
@@ -120,9 +120,15 @@ if $verbose; then
 fi
 ### end options parsing
 
+# TODO: i wonder if there should be an option to send to the default
+# targets, plus any given on the command line.
 
 # set default targets
-if [[ ! -v targets && ! $source && $HOSTNAME == "$MAIL_HOST" ]]; then
+if [[ ! -v targets && ! $source ]]; then
+  if [[ $HOSTNAME != "$MAIL_HOST" ]] && $cron ; then
+    echo "We are not MAIL_HOST, nothing to do"
+    exit 0
+  fi
   case $HOSTNAME in
     kw|x2)
       if ping -q -c1 -w1 iank.vpn.office.fsf.org &>/dev/null; then

diff --git a/mount-latest-subvol b/mount-latest-subvol
index a277b55cbc9c9528542e222cc2ae4ce49aab5587..9bb324b918a20cd0a9357b7d125086f8506c2dfe 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -330,7 +330,7 @@ for vol in q a o i; do
       if [[ $bsub ]]; then
         tmp=$(mktemp)
         # in testing, same subvol is 136 bytes. allow some overhead
-        btrfs send --no-data -p $bsub $leaf | head -c 1000 > $tmp
+        btrfs send --no-data -p $bsub $leaf | head -c 1000 > $tmp || [[ $? == 141 ]]
         if (( $(stat -c%s $tmp) < 1000)); then
           # example output for an empty diff:
           # Found a valid Btrfs stream header, version 1