The branch, 1.2 has been updated
       via  9c3e30d30cac686f3be8c61412754577a072ece3 (commit)
      from  c7798ef2fe8fe0036a43f7102a5016c171e6fc68 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2


- Log -----------------------------------------------------------------
commit 9c3e30d30cac686f3be8c61412754577a072ece3
Author: Ronnie Sahlberg <[email protected]>
Date:   Tue Dec 14 21:17:14 2010 +1100

    50.samba
    
    Net serverid wipe can take a bit of time sometimes so background it.
    
    Only perform auto start/stop of the managed service on the monitor event

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

Summary of changes:
 config/events.d/50.samba |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 17d2336..c4637c0 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -72,7 +72,7 @@ start_samba() {
        # the number of smbd processes will mean that it leaves few cycles for
        # anything else
        [ "$CTDB_MANAGES_SAMBA" = "yes" ] && {
-               /usr/bin/net serverid wipe
+               /usr/bin/net serverid wipe &
 
                nice_service "$CTDB_SERVICE_NMB" start
                nice_service "$CTDB_SERVICE_SMB" start
@@ -206,7 +206,7 @@ periodic_cleanup() {
 
 ###########################
 
-[ "$1" = "init" ] || {
+[ "$1" = "monitor" ] && {
 ctdb_start_stop_service
 ctdb_start_stop_service "winbind"
 }


-- 
CTDB repository

Reply via email to