summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorIvo De Decker <ivodd@debian.org>2014-10-24 23:34:36 +0200
committerIvo De Decker <ivodd@debian.org>2014-10-24 23:57:13 +0200
commit5d1b3dfef2c3c9bbee489a5c54337f0661acc05d (patch)
tree55792812bb3f6a4d35aa4195a420dc020936596b /debian
parent8828d90daf00d46cb95086af5e417a0701b57575 (diff)
downloadsamba-5d1b3dfef2c3c9bbee489a5c54337f0661acc05d.tar.gz
Disable samba init script on upgrade from wheezy to jessie
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/samba.postinst6
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 59c73b8256..d378d60a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ 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
+ * Disable samba init script on upgrade from wheezy to jessie.
+ Thanks again to Michael Biebl for the report.
+ Closes: #766690
-- Ivo De Decker <ivodd@debian.org> Fri, 24 Oct 2014 22:29:49 +0200
diff --git a/debian/samba.postinst b/debian/samba.postinst
index a44ac098d3..a7dc5747d7 100644
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -45,6 +45,12 @@ if dpkg --compare-versions "$2" lt-nl 2:4.0.12+dfsg-2~; then
fi
fi
+if dpkg --compare-versions "$2" lt-nl 2:4.1.13+dfsg-2~; then
+ # on upgrades from wheezy to jessie, the samba init script should not stay
+ # active, see #766690
+ update-rc.d samba remove
+fi
+
# add the sambashare group
if ! getent group sambashare > /dev/null 2>&1
then