From: ianmdlvl <ianmdlvl>
Date: Thu, 28 Aug 2008 18:54:42 +0000 (+0000)
Subject: * backup-snaprsync: pass $vardir as argument to snap-drop
X-Git-Tag: debian_version_4_1_29~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=bb9589a647d1a092cc5fb9f5232d3c835c27c2f6

* 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 fbd3853..82ea5d4 100755
--- 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"
-ssh $sshopts $rhost "
+x ssh $sshopts $rhost "
 	$sshpfx
 	set -e
 	cd $rvardir
@@ -140,7 +140,7 @@ exec 3>&-
 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"
diff --git a/debian/changelog b/debian/changelog
index 0a6390b..65a7fcd 100644
--- 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: