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>
(cherry picked from commit a5c5eee7d186d938c5b458cb6dbf0c78cb548b63)

diff --git a/ctdb/config/functions b/ctdb/config/functions
index 1583bfc707527aa5758a653090d1a494609f6e53..e900f7f06e60620fa10db337977378238a16d95f 100755 (executable)
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -161,6 +161,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