projects
/
platform
/
upstream
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da9aefa
)
If the daemon test is run as root, use a --config option.
author
Wayne Davison
<wayned@samba.org>
Sat, 12 Apr 2008 04:57:17 +0000
(21:57 -0700)
committer
Wayne Davison
<wayned@samba.org>
Sat, 12 Apr 2008 04:57:17 +0000
(21:57 -0700)
testsuite/daemon.test
patch
|
blob
|
history
diff --git
a/testsuite/daemon.test
b/testsuite/daemon.test
index
439b883
..
7717843
100644
(file)
--- a/
testsuite/daemon.test
+++ b/
testsuite/daemon.test
@@
-45,7
+45,16
@@
cd "$scratchdir"
ln -s test-rsyncd.conf rsyncd.conf
-$RSYNC -ve $SSH --rsync-path="$RSYNC" localhost::
+confopt=''
+case `id -u` in
+0)
+ # Root needs to specify the config file, or it uses /etc/rsyncd.conf.
+ echo "Forcing --config=$conf"
+ confopt=" --config=$conf"
+ ;;
+esac
+
+$RSYNC -ve $SSH --rsync-path="$RSYNC$confopt" localhost::
RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
export RSYNC_CONNECT_PROG