diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-04-19 13:10:27 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2013-04-19 13:12:36 +1000 |
| commit | f54dab03d571aa1f805d3fe1866e315226cca130 (patch) | |
| tree | 05092adfbb38c60bbc4ffd1732155f2877845a50 /ctdb/config/ctdb-crash-cleanup.sh | |
| parent | d24077922f5bf3613bfb5c0dc4ced74bd212d7cb (diff) | |
| download | samba-f54dab03d571aa1f805d3fe1866e315226cca130.tar.gz | |
scripts: Ensure service command is in $PATH in ctdb-crash-cleanup.sh
Move the use of the service command below inclusion of functions file,
which sets $PATH.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit d254d03f69cbdc3e473202b759af6e1392cbb59c)
Diffstat (limited to 'ctdb/config/ctdb-crash-cleanup.sh')
| -rwxr-xr-x | ctdb/config/ctdb-crash-cleanup.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/config/ctdb-crash-cleanup.sh b/ctdb/config/ctdb-crash-cleanup.sh index 7796223b36b..b62e3c3abb3 100755 --- a/ctdb/config/ctdb-crash-cleanup.sh +++ b/ctdb/config/ctdb-crash-cleanup.sh @@ -4,16 +4,16 @@ # all public ip addresses if CTDBD has crashed or stopped running. # -# If ctdb is running, just exit -if service ctdb status >/dev/null 2>&1 ; then - exit 0 -fi - [ -n "$CTDB_BASE" ] || \ export CTDB_BASE=$(cd -P $(dirname "$0") ; echo "$PWD") . "$CTDB_BASE/functions" +# If ctdb is running, just exit +if service ctdb status >/dev/null 2>&1 ; then + exit 0 +fi + loadconfig ctdb [ -n "$CTDB_PUBLIC_ADDRESSES" ] || \ |