iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrbk minor fixes
[distro-setup]
/
btrbk-run
diff --git
a/btrbk-run
b/btrbk-run
index 31649a495cf7373fe9af900233c4fc0994813596..187a29a86bcab7a1e1218e94adfea65c664eeddc 100644
(file)
--- a/
btrbk-run
+++ b/
btrbk-run
@@
-216,7
+216,7
@@
for m in "${mountpoints[@]}"; do
break
fi
done
break
fi
done
-if ! $pull_reexec && [[ $source ]] &&
!
$pulla ; then
+if ! $pull_reexec && [[ $source ]] && $pulla ; then
tmpf=$(mktemp)
scp $source:/a/bin/distro-setup/btrbk-run $tmpf
if ! diff -q $tmpf $BASH_SOURCE; then
tmpf=$(mktemp)
scp $source:/a/bin/distro-setup/btrbk-run $tmpf
if ! diff -q $tmpf $BASH_SOURCE; then
@@
-244,7
+244,7
@@
mkdir -p /mnt/root/btrbk
local_zone=$(date +%z)
if [[ $source ]]; then
local_zone=$(date +%z)
if [[ $source ]]; then
- if ! zone=$(ssh root$source date +%z); then
+ if ! zone=$(ssh root
@
$source date +%z); then
die failed to ssh to root@$source
fi
if [[ $zone != $local_zone ]]; then
die failed to ssh to root@$source
fi
if [[ $zone != $local_zone ]]; then
@@
-258,12
+258,12
@@
else
for h in ${targets[@]}; do
if zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z"); then
sshable+=($h)
for h in ${targets[@]}; do
if zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z"); then
sshable+=($h)
+ if [[ $zone != $local_zone ]]; then
+ die "error: dont confuse yourself with multiple time zones. $h has different timezone than localhost"
+ fi
else
sshfail+=($h)
fi
else
sshfail+=($h)
fi
- if [[ $zone != $local_zone ]]; then
- die "error: dont confuse yourself with multiple time zones. $h has different timezone than localhost"
- fi
done
if [[ ! $sshable ]] || { ! $cron && [[ $sshfail ]]; }; then
die "failed to ssh to hosts: ${sshfail[*]}"
done
if [[ ! $sshable ]] || { ! $cron && [[ $sshfail ]]; }; then
die "failed to ssh to hosts: ${sshfail[*]}"