iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various fixes
[distro-setup]
/
btrbk-run
diff --git
a/btrbk-run
b/btrbk-run
index b753b5d7ec4a3b45598ee51105804ff4555c4edf..df17880ed025497749c535431a640797eabf0422 100644
(file)
--- a/
btrbk-run
+++ b/
btrbk-run
@@
-35,6
+35,11
@@
EOF
exit $1
}
exit $1
}
+# latest $MAIL_HOST
+if [[ -e /b/bash_unpublished/source-semi-priv ]]; then
+ source /b/bash_unpublished/source-semi-priv
+fi
+
script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
# note q is owned by root:1000
script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
# note q is owned by root:1000
@@
-147,11
+152,6
@@
case $HOSTNAME in
fi
;;
esac
fi
;;
esac
-case ${targets[0]} in
- kw|kww)
- prospective_mps=(/a)
- ;;
-esac
for mp in ${prospective_mps[@]}; do # default mountpoints to sync
if [[ -e /nocow/btrfs-stale/$mp ]]; then
for mp in ${prospective_mps[@]}; do # default mountpoints to sync
if [[ -e /nocow/btrfs-stale/$mp ]]; then
@@
-268,6
+268,7
@@
fi
if $dry_run; then
m btrbk -v -n $cmd_arg
if $dry_run; then
m btrbk -v -n $cmd_arg
+ exit 0
elif [[ $cmd_arg == archive ]]; then
if [[ $source ]]; then
m btrbk $verbose_arg $progress_arg $cmd_arg ssh://$source$vol $vol
elif [[ $cmd_arg == archive ]]; then
if [[ $source ]]; then
m btrbk $verbose_arg $progress_arg $cmd_arg ssh://$source$vol $vol
@@
-298,11
+299,11
@@
if mountpoint $rsync_mountpoint >/dev/null; then
done
fi
done
fi
-PATH=$script_dir:$PATH
+/a/bin/distro-setup/install-my-scripts
if [[ $source ]]; then
m mount-latest-subvol
else
if [[ $source ]]; then
m mount-latest-subvol
else
- m mount-latest-remote ${targets[@]}
+ m
/a/exe/
mount-latest-remote ${targets[@]}
fi
# todo: move variable data we don't care about backing up
fi
# todo: move variable data we don't care about backing up