sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb: set the path to 'ctdb' in 'functions' in CTDB

Browse Source 
Allow this to be overridden from the caller.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Michael Adam 2016-06-08 12:08:35 +02:00 committed by Martin Schwenke
parent 6ef0a64162
commit 1cc5f8f616
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/config/functions
View File

@ -10,6 +10,8 @@ fi
CTDB_VARDIR="/usr/local/var/lib/ctdb" CTDB_VARDIR="/usr/local/var/lib/ctdb"
ctdb_rundir="/usr/local/var/run/ctdb" ctdb_rundir="/usr/local/var/run/ctdb"
CTDB="${CTDB:-/usr/local/bin/ctdb}"
# Only (and always) override these variables in test code # Only (and always) override these variables in test code
if [ -z "$CTDB_SCRIPT_VARDIR" ] ; then if [ -z "$CTDB_SCRIPT_VARDIR" ] ; then

5
ctdb/wscript
View File

@ -515,9 +515,10 @@ def build(bld):
sed_expr4 = 's|/usr/local/var/run/ctdb|%s|g' % (bld.env.CTDB_RUNDIR) sed_expr4 = 's|/usr/local/var/run/ctdb|%s|g' % (bld.env.CTDB_RUNDIR)
sed_expr5 = 's|/usr/local/sbin|%s|g' % (bld.env.SBINDIR) sed_expr5 = 's|/usr/local/sbin|%s|g' % (bld.env.SBINDIR)
sed_expr6 = 's|/usr/local/libexec/ctdb|%s|g' % (bld.env.CTDB_HELPER_BINDIR) sed_expr6 = 's|/usr/local/libexec/ctdb|%s|g' % (bld.env.CTDB_HELPER_BINDIR)
sed_cmdline = '-e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s"' % \ sed_expr7 = 's|/usr/local/bin|%s|g' % (bld.env.BINDIR)
sed_cmdline = '-e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s"' % \
(sed_expr1, sed_expr2, sed_expr3, sed_expr4, sed_expr5, (sed_expr1, sed_expr2, sed_expr3, sed_expr4, sed_expr5,
sed_expr6) sed_expr6, sed_expr7)
for f in manpages: for f in manpages:
x = '%s.xml' % (f) x = '%s.xml' % (f)