summaryrefslogtreecommitdiffstats
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-12-01 12:21:16 +1100
committerMichael Adam <obnox@samba.org>2015-01-09 02:03:40 +0100
commita5c5eee7d186d938c5b458cb6dbf0c78cb548b63 (patch)
tree31a1101cabf96972528f8a4f8182eae2965ca871 /ctdb
parent82aa6bd2f27775f3fd82931d613379d5d618ef70 (diff)
downloadsamba-a5c5eee7d186d938c5b458cb6dbf0c78cb548b63.tar.gz
samba-a5c5eee7d186d938c5b458cb6dbf0c78cb548b63.tar.xz
samba-a5c5eee7d186d938c5b458cb6dbf0c78cb548b63.zip
ctdb-scripts: Try to deal with Ubuntu having /usr/sbin/service
Falling back to running the initscript doesn't work because it detects that upstart is being used and fails. This was observed when trying to start winbind on Ubuntu 11.04. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'ctdb')
-rwxr-xr-xctdb/config/functions2
1 files changed, 2 insertions, 0 deletions
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 23cb2364e3..df818a0323 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -171,6 +171,8 @@ _service ()
if [ -x /sbin/service ]; then
$_nice /sbin/service "$_service_name" "$_op"
+ elif [ -x /usr/sbin/service ]; then
+ $_nice /usr/sbin/service "$_service_name" "$_op"
elif [ -x $CTDB_ETCDIR/init.d/$_service_name ]; then
$_nice $CTDB_ETCDIR/init.d/$_service_name "$_op"
elif [ -x $CTDB_ETCDIR/rc.d/init.d/$_service_name ]; then