only run "serverid wipe" if we are actually running samba.
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 8 Dec 2010 00:08:19 +0000 (11:08 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 8 Dec 2010 00:08:19 +0000 (11:08 +1100)
we dont need to run this on systems where we do run winbind but not samba

config/events.d/50.samba

index 6e84f5f53dc98e42b32cbaf04a2ac0e76fc2ccae..17d23360782a53acf98d80c4340e3eb81a7dc16b 100755 (executable)
@@ -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
        }