chiark-backup's snaprsync has new rsynccompress option.

diff --git a/backup/snaprsync b/backup/snaprsync
index 3b4bfc7954af9345580ca8b3c7436069856f20cd..91b2ce8948c8831ceab153e84bf503592d3c174e 100755 (executable)
--- a/backup/snaprsync
+++ b/backup/snaprsync
@@ -14,6 +14,7 @@
        bwlimit=
        subdir=.
        rsyncopts=
        bwlimit=
        subdir=.
        rsyncopts=

+       rsynccompress=z

        sshopts=
        summer=summer
 
        sshopts=
        summer=summer
 


@@ -33,7 +34,7 @@ while true; do
                case "$name" in
                rhost|device|mountpoint|localarea);;
                localprevious|snapkind|rsharedir|retcdir|rvardir|bwlimit);;
                case "$name" in
                rhost|device|mountpoint|localarea);;
                localprevious|snapkind|rsharedir|retcdir|rvardir|bwlimit);;

-               subdir|rsyncopts|sshopts|summer);;
+               subdir|rsyncopts|rsynccompress|sshopts|summer);;

                *) badusage "unknown setting $name";;
                esac
                eval "$name=\$value"
                *) badusage "unknown setting $name";;
                esac
                eval "$name=\$value"


@@ -76,7 +77,7 @@ td=`mktemp -td`
 mkfifo -m 600 $td/sentinel
 exec 4<>$td/sentinel
 
 mkfifo -m 600 $td/sentinel
 exec 4<>$td/sentinel
 

-x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop"
+x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop $rvardir"

 ssh $sshopts $rhost "
        $sshpfx
        set -e
 ssh $sshopts $rhost "
        $sshpfx
        set -e


@@ -100,7 +101,7 @@ ssh $sshopts $rhost <$td/sentinel 4<&- "
   cd ..
 " &
 xspawned rsum
   cd ..
 " &
 xspawned rsum

-x $rsync -aHSxz --numeric-ids --delete $rsyncopts \
+x $rsync -aHSx$rsynccompress --numeric-ids --delete $rsyncopts \

        ${localprevious:+--link-dest} $localprevious \
        $rhost:$rvardir/snap-mount/$subdir $localarea/.
 date -u "+ $datefmt rsyncdone"
        ${localprevious:+--link-dest} $localprevious \
        $rhost:$rvardir/snap-mount/$subdir $localarea/.
 date -u "+ $datefmt rsyncdone"

diff --git a/debian/changelog b/debian/changelog
index 9d1fdac32922efffdd316280ea5c2b853c92eb83..2bc2e8fc0a9db2a473dbc2b04c7812fd228fbc5d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chiark-utils (4.1.16) unstable; urgency=low
+
+  * chiark-backup's snaprsync has new rsynccompress option.
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 19 Apr 2007 23:23:32 +0100
+

 chiark-utils (4.1.15) unstable; urgency=low
 
   * chiark-backup's snaprsync sedderies mountpoint out before sums diff.
 chiark-utils (4.1.15) unstable; urgency=low
 
   * chiark-backup's snaprsync sedderies mountpoint out before sums diff.