* backup-snaprsync: pass $vardir as argument to snap-drop

* backup-snaprsync: add a missing x prefix to an ssh invocation

diff --git a/backup/snaprsync b/backup/snaprsync
index fbd385339fe45990a8ae0e2c466192c10d9345ea..82ea5d416f8ab1dc86349b2c7287a7a3dd886626 100755 (executable)
--- a/backup/snaprsync
+++ b/backup/snaprsync
@@ -103,7 +103,7 @@ mkfifo -m 600 $td/sentinel
 exec 4<>$td/sentinel
 
 x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop $rvardir"
 exec 4<>$td/sentinel
 
 x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop $rvardir"

-ssh $sshopts $rhost "
+x ssh $sshopts $rhost "

        $sshpfx
        set -e
        cd $rvardir
        $sshpfx
        set -e
        cd $rvardir


@@ -140,7 +140,7 @@ exec 3>&-
 xwait rsum
 exec 4<&-
 date -u "+ $datefmt sumsdone"
 xwait rsum
 exec 4<&-
 date -u "+ $datefmt sumsdone"

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

 
 if [ "x${localprevious}" != x ] && test -f "$localprevious,rsums"; then
        cp "$localprevious,rsums" "$localarea,rsums"
 
 if [ "x${localprevious}" != x ] && test -f "$localprevious,rsums"; then
        cp "$localprevious,rsums" "$localarea,rsums"

diff --git a/debian/changelog b/debian/changelog
index 0a6390b526780d42db23c031a8eddc154c113630..65a7fcdd5be2891e5b29bdd6f1aea67216afe79d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-utils (4.1.29) unstable; urgency=low
+
+  * backup-snaprsync: pass $vardir as argument to snap-drop
+  * backup-snaprsync: add a missing x prefix to an ssh invocation
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 28 Aug 2008 19:54:34 +0100
+

 chiark-utils (4.1.28) unstable; urgency=high
 
   chiark-named-conf:
 chiark-utils (4.1.28) unstable; urgency=high
 
   chiark-named-conf: