From 6d8077eb9c7129f4bdb352132e565906568dfb66 Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Thu, 17 Mar 2011 11:44:25 +0000 Subject: Revert "syncdaemon: make /usr/libexec/gsyncd the default remote gsyncd (incomplete hacky quickfix)" This reverts commit 8c801cfd05eb533ae64ea9f06e49e632955cf0c0. The commit in question was just a temporary fix (which violated component boundaries). Since 9043b0f8 we don't rely on this fix. Signed-off-by: Csaba Henk Signed-off-by: Vijay Bellur BUG: 2427 (set a proper default for remote syncdaemon) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2427 --- xlators/features/marker/utils/syncdaemon/gsyncd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/features/marker/utils/syncdaemon') diff --git a/xlators/features/marker/utils/syncdaemon/gsyncd.py b/xlators/features/marker/utils/syncdaemon/gsyncd.py index e34a6bcb233..d5772013e49 100644 --- a/xlators/features/marker/utils/syncdaemon/gsyncd.py +++ b/xlators/features/marker/utils/syncdaemon/gsyncd.py @@ -186,7 +186,7 @@ def main_i(): op.add_option('-p', '--pid-file', metavar='PIDF', type=str, action='callback', callback=store_abs) op.add_option('-l', '--log-file', metavar='LOGF', type=str, action='callback', callback=store_abs) op.add_option('-L', '--log-level', metavar='LVL') - op.add_option('-r', '--remote-gsyncd', metavar='CMD', default='/usr/libexec/gsyncd') + op.add_option('-r', '--remote-gsyncd', metavar='CMD', default=os.path.abspath(sys.argv[0])) op.add_option('-s', '--ssh-command', metavar='CMD', default='ssh') op.add_option('--rsync-command', metavar='CMD', default='rsync') op.add_option('--rsync-extra', metavar='ARGS', default='-sS', help=SUPPRESS_HELP) -- cgit