ctdb-scripts: add new 48.netbios script for starting nmbd

This change basically moves out nmbd references from 50.samba script to
a new 48.netbios script. Accordingly ctdb test scripts are tweaked to
cope with newly added script.

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>

6 files changed, 51 insertions, 4 deletions

diff --git a/ctdb/tests/UNIT/eventscripts/48.netbios.shutdown.011.sh b/ctdb/tests/UNIT/eventscripts/48.netbios.shutdown.011.sh
new file mode 100755
index 00000000000..06498138577
--- /dev/null
+++ b/ctdb/tests/UNIT/eventscripts/48.netbios.shutdown.011.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "shutdown, Debian init style"
+
+setup
+
+export EVENTSCRIPT_TESTS_INIT_STYLE="debian"
+
+ok <<EOF
+Stopping nmbd: OK
+EOF
+simple_test
diff --git a/ctdb/tests/UNIT/eventscripts/48.netbios.startup.011.sh b/ctdb/tests/UNIT/eventscripts/48.netbios.startup.011.sh
new file mode 100755
index 00000000000..40b90a10e65
--- /dev/null
+++ b/ctdb/tests/UNIT/eventscripts/48.netbios.startup.011.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "shutdown, Debian init style"
+
+setup
+
+export EVENTSCRIPT_TESTS_INIT_STYLE="debian"
+
+ok <<EOF
+Starting nmbd: OK
+EOF
+simple_test
diff --git a/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.011.sh b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.011.sh
index a64696bf723..94867e0a71f 100755
--- a/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.011.sh
@@ -10,6 +10,5 @@ export EVENTSCRIPT_TESTS_INIT_STYLE="debian"
 
 ok <<EOF
 Stopping smbd: OK
-Stopping nmbd: OK
 EOF
 simple_test
diff --git a/ctdb/tests/UNIT/eventscripts/50.samba.startup.011.sh b/ctdb/tests/UNIT/eventscripts/50.samba.startup.011.sh
index ce79767fb36..8c4699d45d2 100755
--- a/ctdb/tests/UNIT/eventscripts/50.samba.startup.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.startup.011.sh
@@ -9,7 +9,6 @@ setup
 export EVENTSCRIPT_TESTS_INIT_STYLE="debian"
 
 ok <<EOF
-Starting nmbd: OK
 Starting smbd: OK
 EOF
 simple_test
diff --git a/ctdb/tests/UNIT/eventscripts/scripts/48.netbios.sh b/ctdb/tests/UNIT/eventscripts/scripts/48.netbios.sh
new file mode 100644
index 00000000000..f578399a3cd
--- /dev/null
+++ b/ctdb/tests/UNIT/eventscripts/scripts/48.netbios.sh
@@ -0,0 +1,21 @@
+setup ()
+{
+	service_name="netbios"
+
+	if [ "$1" != "down" ] ; then
+
+		debug "Marking Netbios name services as up, listening and managed by CTDB"
+
+		# All possible service names for all known distros.
+		for i in "nmb" "nmbd" ; do
+			service "$i" force-started
+		done
+	else
+		debug "Marking Netbios name services as down, not listening and not managed by CTDB"
+
+		# All possible service names for all known distros.
+		for i in "nmb" "nmbd" ; do
+			service "$i" force-stopped
+		done
+	fi
+}
diff --git a/ctdb/tests/UNIT/eventscripts/scripts/50.samba.sh b/ctdb/tests/UNIT/eventscripts/scripts/50.samba.sh
index 3ffe18a201e..51175dbe84a 100644
--- a/ctdb/tests/UNIT/eventscripts/scripts/50.samba.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/50.samba.sh
@@ -7,7 +7,7 @@ setup ()
 		debug "Marking Samba services as up, listening and managed by CTDB"
 
 		# All possible service names for all known distros.
-		for i in "smb" "nmb" "samba" "smbd" "nmbd" ; do
+		for i in "smb" "samba" "smbd" ; do
 			service "$i" force-started
 		done
 
@@ -21,7 +21,7 @@ setup ()
 		debug "Marking Samba services as down, not listening and not managed by CTDB"
 
 		# All possible service names for all known distros.
-		for i in "smb" "nmb" "samba" "smbd" "nmbd" ; do
+		for i in "smb" "samba" "smbd" ; do
 			service "$i" force-stopped
 		done