scripts: ctdb-crash-cleanup.sh uses initscript to see if ctdbd is running
authorMartin Schwenke <martin@meltin.net>
Mon, 15 Apr 2013 05:42:55 +0000 (15:42 +1000)
committerAmitay Isaacs <amitay@gmail.com>
Fri, 19 Apr 2013 06:50:39 +0000 (16:50 +1000)
"ctdb ping" (or "ctdb status") can time out.  How many times should we
try?

Instead, depend on the initscript to implement something sane.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 90cb337e5ccf397b69a64298559a428ff508f196)

Conflicts:
config/ctdb-crash-cleanup.sh

config/ctdb-crash-cleanup.sh

index 420db76727b9e65f7fa625647f9ddd6752b1c3de..4809c2332ff5d6d881aac19fbbd5dc95a5c15c45 100755 (executable)
        exit 1
 }
 
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
+
 # if ctdb is running, just return
-ctdb status 2>/dev/null && {
+service ctdb status >/dev/null 2>&1 && {
     exit 0
 }