[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  02c2958 ctdb-scripts: Drop unnecessary detect_init_style() call
       via  61d38c8 ctdb-scripts: Support systemctl directly
      from  1c76746 notifyd: prevent NULL deref segfault in notifyd_peer_destructor

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 02c2958d1d7534a1c36db18d7735ebc99ef13d96
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed May 11 02:44:26 2016 +1000

    ctdb-scripts: Drop unnecessary detect_init_style() call
    
    CTDB_INIT_STYLE isn't used in this script.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Kai Blin <kai at samba.org>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Fri May 20 21:06:18 CEST 2016 on sn-devel-144

commit 61d38c8556ddbdd99de8186f5246f597241f62de
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed May 11 02:42:40 2016 +1000

    ctdb-scripts: Support systemctl directly
    
    Some Linux distributions don't have a "service" compatibility command.
    
    To avoid breaking working systems, prefer the "service" compatibility
    command just in case it does some extra, unexpected magic.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Kai Blin <kai at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/config/events.d/49.winbind | 2 --
 ctdb/config/functions           | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind
index a1ea787..33d47c8 100755
--- a/ctdb/config/events.d/49.winbind
+++ b/ctdb/config/events.d/49.winbind
@@ -6,8 +6,6 @@
 
 . $CTDB_BASE/functions
 
-detect_init_style
-
 CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
 
 service_name="winbind"
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 8a8ee8c..c1316bd 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -212,6 +212,8 @@ _service ()
       $_nice /sbin/service "$_service_name" "$_op"
   elif [ -x /usr/sbin/service ]; then
       $_nice /usr/sbin/service "$_service_name" "$_op"
+  elif [ -x /bin/systemctl ]; then
+      $_nice /bin/systemctl "$_op" "$_service_name"
   elif [ -x $CTDB_SYS_ETCDIR/init.d/$_service_name ]; then
       $_nice $CTDB_SYS_ETCDIR/init.d/$_service_name "$_op"
   elif [ -x $CTDB_SYS_ETCDIR/rc.d/init.d/$_service_name ]; then


-- 
Samba Shared Repository