[Pkg-samba-maint] [samba] 02/04: handle AD samba daemon in samba init script

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

idd-guest pushed a commit to branch samba_4.0
in repository samba.

commit adc4e0391da987ae70cbbac287dc46812513f7e7
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Wed Oct 9 23:17:04 2013 +0200

    handle AD samba daemon in samba init script
---
 debian/rules                                        |    1 +
 debian/samba.init                                   |    4 ++++
 debian/{samba-ad-dc.init => samba.samba-ad-dc.init} |    2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 5529e20..a215f8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,6 +150,7 @@ override_dh_installinit:
 ifneq (,$(filter samba, $(shell dh_listpackages)))
 	dh_installinit -psamba --name smbd
 	dh_installinit -psamba --name nmbd
+	dh_installinit -psamba --name samba-ad-dc
 	dh_installinit -psamba --noscripts
 	dh_installinit -psamba --no-start --name reload-smbd
 endif
diff --git a/debian/samba.init b/debian/samba.init
index eedb48e..e38fd45 100644
--- a/debian/samba.init
+++ b/debian/samba.init
@@ -15,8 +15,10 @@ case $1 in
 	start)
 		/etc/init.d/nmbd start
 		/etc/init.d/smbd start
+		/etc/init.d/samba-ad-dc start
 		;;
 	stop)
+		/etc/init.d/samba-ad-dc stop
 		/etc/init.d/smbd stop
 		/etc/init.d/nmbd stop
 		;;
@@ -26,6 +28,7 @@ case $1 in
 	restart|force-reload)
 		/etc/init.d/nmbd "$1"
 		/etc/init.d/smbd "$1"
+		/etc/init.d/samba-ad-dc "$1"
 		;;
 	status)
 		status=0
@@ -34,6 +37,7 @@ case $1 in
 			/etc/init.d/nmbd status || status=$?
 		fi
 		/etc/init.d/smbd status || status=$?
+		/etc/init.d/samba-ad-dc status || status=$?
 		exit $status
 		;;
 	*)
diff --git a/debian/samba-ad-dc.init b/debian/samba.samba-ad-dc.init
similarity index 96%
rename from debian/samba-ad-dc.init
rename to debian/samba.samba-ad-dc.init
index ee799e2..bff4838 100644
--- a/debian/samba-ad-dc.init
+++ b/debian/samba.samba-ad-dc.init
@@ -52,7 +52,7 @@ case "$1" in
 		fi
 		log_daemon_msg "Stopping Samba AD DC daemon" "samba"
 
-		start-stop-daemon --stop --quiet --name samba $SAMBAPID
+		start-stop-daemon --stop --quiet --pidfile $SAMBAPID
 		# Wait a little and remove stale PID file
 		sleep 1
 		if [ -f $SAMBAPID ] && ! ps h `cat $SAMBAPID` > /dev/null

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git