From: Ronnie Sahlberg Date: Wed, 8 Dec 2010 00:08:19 +0000 (+1100) Subject: only run "serverid wipe" if we are actually running samba. X-Git-Url: http://git.samba.org/?p=sahlberg%2Fctdb.git;a=commitdiff_plain;h=5b59e39a2b98428de8ec75180dd0688b03175d05 only run "serverid wipe" if we are actually running samba. we dont need to run this on systems where we do run winbind but not samba --- diff --git a/config/events.d/50.samba b/config/events.d/50.samba index 6e84f5f5..17d23360 100755 --- a/config/events.d/50.samba +++ b/config/events.d/50.samba @@ -63,8 +63,6 @@ start_samba() { } - /usr/bin/net serverid wipe - # start the winbind service [ "$CTDB_MANAGES_WINBIND" = "yes" ] && { service "$CTDB_SERVICE_WINBIND" start @@ -74,6 +72,8 @@ 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 + nice_service "$CTDB_SERVICE_NMB" start nice_service "$CTDB_SERVICE_SMB" start }