Replace monolithic old style startup script with two new style startup

scripts which include backward compatibility for pre 1.5 systems.

3 files changed, 48 insertions, 12 deletions

diff --git a/net/samba/files/nmbd.sh b/net/samba/files/nmbd.sh
new file mode 100755
index 00000000000..79930fb04e3
--- /dev/null
+++ b/net/samba/files/nmbd.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# $NetBSD: nmbd.sh,v 1.1 2001/02/04 15:29:58 tron Exp $
+#
+# PROVIDE: nmbd
+# REQUIRE: DAEMON
+
+name="nmbd"
+command="@PREFIX@/sbin/${name}"
+command_args="-D"
+
+if [ ! -d /etc/rc.d ]
+then
+	@ECHO@ -n ' ${name}'
+	exec ${command} ${command_args}
+fi
+
+. /etc/rc.subr
+
+pidfile="/var/run/samba/${name}.pid"
+required_files="/etc/samba/smb.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh
deleted file mode 100644
index a5d34674320..00000000000
--- a/net/samba/files/samba.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: samba.sh,v 1.2 2000/05/02 15:24:09 jlam Exp $
-
-smbd=@PREFIX@/sbin/smbd
-nmbd=@PREFIX@/sbin/nmbd
-
-if [ -f ${smbd} ]; then
-	@ECHO@ -n ' samba'
-	${smbd} -D
-	${nmbd} -D
-fi
diff --git a/net/samba/files/smbd.sh b/net/samba/files/smbd.sh
new file mode 100755
index 00000000000..d04b8a54068
--- /dev/null
+++ b/net/samba/files/smbd.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# $NetBSD: smbd.sh,v 1.1 2001/02/04 15:29:59 tron Exp $
+#
+# PROVIDE: smbd
+# REQUIRE: nmbd
+
+name="smbd"
+command="@PREFIX@/sbin/${name}"
+command_args="-D"
+
+if [ ! -d /etc/rc.d ]
+then
+	@ECHO@ -n ' ${name}'
+	exec ${command} ${command_args}
+fi
+
+. /etc/rc.subr
+
+pidfile="/var/run/samba/${name}.pid"
+required_files="/etc/samba/smb.conf"
+
+load_rc_config $name
+run_rc_command "$1"