[Pkg-samba-maint] [samba] 03/03: Disable the init script when on upstart

[Steve Langasek]

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

vorlon pushed a commit to branch samba_4.0
in repository samba.

commit 45c13ad14ec09f89e2afc4de043abb0fbffcf96e
Author: Steve Langasek <steve.langasek at canonical.com>
Date:   Fri Aug 16 11:31:03 2013 +0200

    Disable the init script when on upstart
---
 debian/samba-ad-dc.init |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/samba-ad-dc.init b/debian/samba-ad-dc.init
index 490b15b..ee799e2 100644
--- a/debian/samba-ad-dc.init
+++ b/debian/samba-ad-dc.init
@@ -32,6 +32,9 @@ case "$1" in
 		    exit 0
 		fi
 
+		if init_is_upstart; then
+			exit 1
+		fi
 		log_daemon_msg "Starting Samba AD DC daemon" "samba"
 		# Make sure we have our PIDDIR, even if it's on a tmpfs
 		install -o root -g root -m 755 -d $PIDDIR
@@ -44,6 +47,9 @@ case "$1" in
 		log_end_msg 0
 		;;
 	stop)
+		if init_is_upstart; then
+			exit 0
+		fi
 		log_daemon_msg "Stopping Samba AD DC daemon" "samba"
 
 		start-stop-daemon --stop --quiet --name samba $SAMBAPID
@@ -60,6 +66,9 @@ case "$1" in
 
 		;;
 	restart|force-reload)
+		if init_is_upstart; then
+			exit 1
+		fi
 		$0 stop
 		sleep 1
 		$0 start

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