~mdw
/
rsync-backup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rsync-backup.in: Add `-n' option to usage synopsis.
[rsync-backup]
/
rsync-backup.in
diff --git
a/rsync-backup.in
b/rsync-backup.in
index
3802efb
..
67d0efb
100644
(file)
--- a/
rsync-backup.in
+++ b/
rsync-backup.in
@@
-133,7
+133,7
@@
hostrun () {
## way it will be processed by a shell.
if localp $host; then run "@$host: $tag" sh -c "$cmd"
## way it will be processed by a shell.
if localp $host; then run "@$host: $tag" sh -c "$cmd"
- else run "@$host: $tag" ssh $host "$cmd"
+ else run "@$host: $tag" ssh $
userat$
host "$cmd"
fi
}
fi
}
@@
-153,7
+153,7
@@
hostpath () {
## current host is local.
if localp $host; then echo $path
## current host is local.
if localp $host; then echo $path
- else echo $host:$path
+ else echo $
userat$
host:$path
fi
}
fi
}
@@
-310,7
+310,7
@@
do_rfreezefs () {
## Get the volume host to create the snapshot.
set +e
## Get the volume host to create the snapshot.
set +e
- _hostrun >&2 3>&- $lvhost \
+ _hostrun >&2 3>&- $
userat$
lvhost \
"lvcreate --snapshot -n$lv.bkp $SNAPSIZE $vg/$lv"
snaprc=$?
set -e
"lvcreate --snapshot -n$lv.bkp $SNAPSIZE $vg/$lv"
snaprc=$?
set -e
@@
-321,7
+321,7
@@
do_rfreezefs () {
case $tok in
"$tok_THAWED") ;;
*)
case $tok in
"$tok_THAWED") ;;
*)
- _hostrun >&2 3>&- $lvhost "lvremove -f $vg/$lv.bkp" || :
+ _hostrun >&2 3>&- $
userat$
lvhost "lvremove -f $vg/$lv.bkp" || :
echo >&2 "$quis: unexpected token $tok (rfreezefs $fsdir on $fshost)"
exit 1
;;
echo >&2 "$quis: unexpected token $tok (rfreezefs $fsdir on $fshost)"
exit 1
;;
@@
-348,7
+348,7
@@
do_rfreezefs () {
esac
## Mount the snapshot on the volume host.
esac
## Mount the snapshot on the volume host.
- _hostrun >&2 $lvhost "
+ _hostrun >&2 $
userat$
lvhost "
mkdir -p $SNAPDIR/$lv
mount -oro /dev/$vg/$lv.bkp $SNAPDIR/$lv"
}
mkdir -p $SNAPDIR/$lv
mount -oro /dev/$vg/$lv.bkp $SNAPDIR/$lv"
}
@@
-525,7
+525,7
@@
unset VOLUME
bkprc=0
remote_fshash () {
bkprc=0
remote_fshash () {
- _hostrun $host "
+ _hostrun $
userat$
host "
umask 077
mkdir -p $fshashdir
cd ${snapmnt#*:}
umask 077
mkdir -p $fshashdir
cd ${snapmnt#*:}
@@
-841,7
+841,7
@@
backup () {
host () {
host=$1
host () {
host=$1
- like=
+ like=
userat=
case "${expire_policy+t},${default_policy+t}" in
t,) default_policy=$expire_policy ;;
esac
case "${expire_policy+t},${default_policy+t}" in
t,) default_policy=$expire_policy ;;
esac
@@
-853,6
+853,7
@@
snaptype () { snap=$1; shift; snapargs="$*"; retry=0; }
rsyncargs () { rsyncargs="$*"; }
like () { like="$*"; }
retry () { retry="$*"; }
rsyncargs () { rsyncargs="$*"; }
like () { like="$*"; }
retry () { retry="$*"; }
+user () { userat="$*@"; }
retain () {
case $clear_policy in t) unset expire_policy; clear_policy=nil ;; esac
retain () {
case $clear_policy in t) unset expire_policy; clear_policy=nil ;; esac
@@
-864,7
+865,7
@@
retain () {
### Read the configuration and we're done.
usage () {
### Read the configuration and we're done.
usage () {
- echo "usage: $quis [-v] [-c CONF]"
+ echo "usage: $quis [-
n
v] [-c CONF]"
}
version () {
}
version () {