X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=backup%2Fsnaprsync;h=504ebd8a1d610937fdf1cffa7924817048935aa9;hb=d9d8b1a736946ae91c521133dc32d5e1d6b5e506;hp=5cd567a2c3ff9c0df27a70c45c5054d66109c30d;hpb=81c1c5a8731555d6f1d67b3d834356619907e3a1;p=chiark-utils.git

diff --git a/backup/snaprsync b/backup/snaprsync
index 5cd567a..504ebd8 100755
--- a/backup/snaprsync
+++ b/backup/snaprsync
@@ -14,6 +14,8 @@
 	bwlimit=
 	subdir=.
 	rsyncopts=
+	rsynccompress=z
+	sshopts=
 	summer=summer
 
 set -e
@@ -32,7 +34,7 @@ while true; do
 		case "$name" in
 		rhost|device|mountpoint|localarea);;
 		localprevious|snapkind|rsharedir|retcdir|rvardir|bwlimit);;
-		subdir|rsyncopts|summer);;
+		subdir|rsyncopts|rsynccompress|sshopts|summer);;
 		*) badusage "unknown setting $name";;
 		esac
 		eval "$name=\$value"
@@ -54,13 +56,13 @@ done
 
 datefmt='%Y-%m-%d %H:%M:%S Z'
 rsync="rsync ${bwlimit:+--bwlimit} $bwlimit"
-export RSYNC_RSH='ssh -o compression=no'
+export RSYNC_RSH="ssh -o compression=no $sshopts"
 sshpfx='PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin; export PATH; '
 
-ssh $rhost "$sshpfx date -u '+$rhost $datefmt start'"
-ssh $rhost "$sshpfx id"
-ssh $rhost "$sshpfx ls -d $rsharedir"
-ssh $rhost "$sshpfx ls -d $rvardir"
+ssh $sshopts $rhost "$sshpfx date -u '+$rhost $datefmt start'"
+ssh $sshopts $rhost "$sshpfx id"
+ssh $sshopts $rhost "$sshpfx ls -d $rsharedir"
+ssh $sshopts $rhost "$sshpfx ls -d $rvardir"
 
 test -d $localarea || x mkdir $localarea
 ournode=`uname -n`
@@ -75,16 +77,16 @@ td=`mktemp -td`
 mkfifo -m 600 $td/sentinel
 exec 4<>$td/sentinel
 
-x ssh $rhost "$sshpfx $rsharedir/snap-drop"
-ssh $rhost "
+x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop $rvardir"
+ssh $sshopts $rhost "
 	$sshpfx
 	set -e
 	cd $rvardir
 	echo '$retcdir/snap/$snapkind drop $rvardir' >snap-drop.new
 	mv snap-drop.new snap-drop
 "
-x ssh $rhost "$sshpfx $retcdir/snap/$snapkind snap $rvardir $device $mountpoint"
-ssh $rhost <$td/sentinel 4<&- "
+x ssh $sshopts $rhost "$sshpfx $retcdir/snap/$snapkind snap $rvardir $device $mountpoint"
+ssh $sshopts $rhost <$td/sentinel 4<&- "
   $sshpfx
   set -e
   date -u '+$rhost $datefmt main'
@@ -99,7 +101,7 @@ ssh $rhost <$td/sentinel 4<&- "
   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"
@@ -113,12 +115,12 @@ exec 3>&-
 xwait rsum
 exec 4<&-
 date -u "+ $datefmt sumsdone"
-x ssh $rhost "$sshpfx $rsharedir/snap-drop"
+x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop"
 
 if [ "x${localprevious}" != x ] && test -f "$localprevious,rsums"; then
 	cp "$localprevious,rsums" "$localarea,rsums"
 fi
-x $rsync -p \
+x $rsync -pI \
 	$rhost:$rvardir/$rsumsfile \
 	"$localarea,rsums"
 
@@ -126,7 +128,8 @@ xwait $lsum
 date -u "+ $datefmt checking"
 
 set +e
-diff -u "$localarea,rsums" "$localarea,lsums" >"$localarea,sumsdiff"
+diff -u <(sed -e 's/^mountpoint/dir       /' "$localarea,rsums") \
+  "$localarea,lsums" >"$localarea,sumsdiff"
 diffrc=$?
 set -e
 test $diffrc = 0 || test $diffrc = 1