ctdb: use properly configured ctdb in ctdbd_wrapper
authorMichael Adam <obnox@samba.org>
Tue, 7 Jun 2016 07:44:53 +0000 (07:44 +0000)
committerMartin Schwenke <martins@samba.org>
Sat, 11 Jun 2016 04:20:13 +0000 (06:20 +0200)
This makes ctdbd_wrapper usable in non-standard installs.

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

index b1f71c343b37a639294c20a0cd82217e7ad49ea7..b6b983c5d1df421ae09b50310cd20870cfa91eae 100755 (executable)
@@ -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}