From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Tue, 14 Dec 2010 10:17:14 +0000 (+1100)
Subject: 50.samba
X-Git-Url: http://git.samba.org/?p=metze%2Fctdb%2Fwip.git;a=commitdiff_plain;h=deba5cbbf7703a1a24ce88a06c73fca056e05521

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
---

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 17d23360..c4637c04 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"
 }