From: Michael Adam <obnox@samba.org>
Date: Tue, 7 Jun 2016 07:44:53 +0000 (+0000)
Subject: ctdb: use properly configured ctdb in ctdbd_wrapper
X-Git-Tag: tdb-1.3.10~897
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09d8fe729315759dbc33de56b4aefbb0a57821ad;p=thirdparty%2Fsamba.git

ctdb: use properly configured ctdb in ctdbd_wrapper

This makes ctdbd_wrapper usable in non-standard installs.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index b1f71c343b3..b6b983c5d1d 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -256,7 +256,7 @@ start()
 		return 1
 	    fi
 
-	    if ctdb runstate first_recovery startup running >/dev/null 2>&1 ; then
+	    if $CTDB runstate first_recovery startup running >/dev/null 2>&1 ; then
 		return 0
 	    fi
 	fi
@@ -278,7 +278,7 @@ stop()
 	return 0
     fi
 
-    ctdb shutdown
+    $CTDB shutdown
 
     # Wait for remaining CTDB processes to exit...
     _timeout=${CTDB_SHUTDOWN_TIMEOUT:-30}