From bfcdf48381a35f08f2dc0cf5ea2751c9d3406dd9 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@refining-linux.org>
Date: Mon, 6 Oct 2014 00:37:20 +0200
Subject: [PATCH] Fix rsync session terminating

---
 server/usr/bin/rs-run-ssh-cmd | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/usr/bin/rs-run-ssh-cmd b/server/usr/bin/rs-run-ssh-cmd
index ac3e974..c1552d7 100755
--- a/server/usr/bin/rs-run-ssh-cmd
+++ b/server/usr/bin/rs-run-ssh-cmd
@@ -36,8 +36,10 @@ if $(echo "${SSH_ORIGINAL_COMMAND}" | grep -q "^\(internal-sftp\|/usr/lib/ssh/sf
 	[ -x /opt/libexec/sftp-server ] && exec /opt/libexec/sftp-server -R
 else
 	RSYNC=/usr/bin/rsync
-	[ ! -x $RSYNC ] && [ -x /opt/bin/rsync ] && RSYNC=/opt/bin/rsync
-	exec $RSYNC --server --daemon --config="${home_dir}/rsync.conf"
+	RSYNC_OPTS="--server --daemon --config='$home_dir/rsync.conf' ."
+	[ -x $RSYNC ] && exec $RSYNC $(eval echo $RSYNC_OPTS)
+	RSYNC=/opt/bin/rsync
+	[ -x $RSYNC ] && exec $RSYNC $(eval echo $RSYNC_OPTS)
 fi
 
 echo "Session failed." >&2