[Pkg-samba-maint] [samba] 01/02: Mask /etc/init.d/samba init script for systemd

[Ivo De Decker]

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

ivodd pushed a commit to branch master
in repository samba.

commit 8828d90daf00d46cb95086af5e417a0701b57575
Author: Ivo De Decker <ivodd at debian.org>
Date:   Fri Oct 24 22:39:29 2014 +0200

    Mask /etc/init.d/samba init script for systemd
---
 debian/changelog     | 8 ++++++++
 debian/rules         | 3 +++
 debian/samba.install | 1 +
 3 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4d63958..59c73b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+samba (2:4.1.13+dfsg-2) UNRELEASED; urgency=medium
+
+  * Mask /etc/init.d/samba init script for systemd. This should make systemd
+    ignore the samba init script. Thanks to Michael Biebl for the suggestion.
+    Closes: #740942
+
+ -- Ivo De Decker <ivodd at debian.org>  Fri, 24 Oct 2014 22:29:49 +0200
+
 samba (2:4.1.13+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 383385c..124c3b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,6 +133,9 @@ override_dh_install:
 	mkdir -p debian/samba/usr/lib/$(PYSHORT)/dist-packages/samba
 	mv $(DESTDIR)/usr/lib/$(PYSHORT)/dist-packages/samba/dckeytab.so \
 	   debian/samba/usr/lib/$(PYSHORT)/dist-packages/samba/dckeytab.so
+	# mask /etc/init.d/samba init script for systemd
+	mkdir -p $(DESTDIR)/lib/systemd/system/
+	ln -s /dev/null $(DESTDIR)/lib/systemd/system/samba.service
 	# use upstream version of smb.conf.5 if there is no built version
 	# this is a temporary workaround for #750593 in xsltproc
 	[ -e $(DESTIDR)/usr/share/man/man5/smb.conf.5 ] || \
diff --git a/debian/samba.install b/debian/samba.install
index 55fa28f..81eac8c 100644
--- a/debian/samba.install
+++ b/debian/samba.install
@@ -1,3 +1,4 @@
+lib/systemd/system/samba.service
 usr/bin/eventlogadm
 usr/bin/oLschema2ldif
 usr/bin/pdbedit

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