From: ianmdlvl <ianmdlvl>
Date: Fri, 9 Jun 2006 23:59:05 +0000 (+0000)
Subject: set paths on remote commands
X-Git-Tag: debian_version_4_1_0~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=83d48f5254c0d9c7e3cbeaaec33459bb8398638f

set paths on remote commands
---

diff --git a/backup/snaprsync b/backup/snaprsync
index 67716bb..8145140 100755
--- a/backup/snaprsync
+++ b/backup/snaprsync
@@ -50,11 +50,12 @@ done
 datefmt='%Y-%m-%d %H:%M:%S Z'
 rsync="rsync ${bwlimit:+--bwlimit} $bwlimit"
 export RSYNC_RSH='ssh -o compression=no'
+sshpfx='PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin; export PATH; '
 
-ssh $rhost "date -u '+$rhost $datefmt start'"
-ssh $rhost id
-ssh $rhost ls -d $rsharedir
-ssh $rhost ls -d $rvardir
+ssh $rhost "$sshpfx date -u '+$rhost $datefmt start'"
+ssh $rhost "$sshpfx id"
+ssh $rhost "$sshpfx ls -d $rsharedir"
+ssh $rhost "$sshpfx ls -d $rvardir"
 
 test -d $localarea || x mkdir $localarea
 ournode=`uname -n`
@@ -69,9 +70,10 @@ td=`mktemp -td`
 mkfifo -m 600 $td/sentinel
 exec 4<>$td/sentinel
 
-x ssh $rhost "$rsharedir/snap-drop"
-x ssh $rhost "$retcdir/snap/$snapkind snap $rvardir $device $mountpoint"
+x ssh $rhost "$sshpfx $rsharedir/snap-drop"
+x ssh $rhost "$sshpfx $retcdir/snap/$snapkind snap $rvardir $device $mountpoint"
 ssh $rhost <$td/sentinel 4<&- "
+  $sshpfx
   set -e
   date -u '+$rhost $datefmt main'
   exec 3<&0 0</dev/null
@@ -101,7 +103,7 @@ exec 3>&-
 xwait rsum
 exec 4<&-
 date -u "+ $datefmt sumsdone"
-x ssh $rhost "$rsharedir/snap-drop"
+x ssh $rhost "$sshpfx $rsharedir/snap-drop"
 
 if [ "x${localprevious}" != x ]; then
 	cp "$localprevious,rsums" "$localarea,rsums"