[proftpd-dfsg] 01/01: Don't check for DONTSTART in postin script.

[Hilmar Preuße]

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

hilmar-guest pushed a commit to branch master
in repository proftpd-dfsg.

commit edddd153819716e38ac8dbf093cb61fddd6a14e5
Author: Hilmar Preusse <hille42 at web.de>
Date:   Sun Jan 7 22:10:49 2018 +0100

    Don't check for DONTSTART in postin script.
---
 debian/changelog              |  5 ++++-
 debian/proftpd-basic.postinst | 19 +++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dbb23a..0941a0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,10 @@ proftpd-dfsg (1.3.5e-1) unstable; urgency=medium
     (Closes: #884558)
   * Call "dh_strip -a" before "dh_gencontrol -a" to generate dbgsym
     packages.
-  * update update-rc.d command in postin script
+  * postin script:
+    - update update-rc.d command: don't specify runlevel
+    - don't set DONTSTART and don't check for its value
+      (probably relics from debconf times)
 
   [ Francesco Paolo Lovergine ]
   * New upstream version. Patchset updated.
diff --git a/debian/proftpd-basic.postinst b/debian/proftpd-basic.postinst
index 26a483e..bb94afd 100644
--- a/debian/proftpd-basic.postinst
+++ b/debian/proftpd-basic.postinst
@@ -115,8 +115,6 @@ EOF
 	fi
 }
 
-DONTSTART=0
-
 . /usr/share/debconf/confmodule
 
 # update-ined is used if found, else you are on your own
@@ -180,17 +178,14 @@ fi
 
 if [ -e "/etc/init.d/proftpd" ]; then
     update-rc.d proftpd defaults >/dev/null
-    if [ $DONTSTART -eq 0 ] ; then
-        set +e 
-	    proftpd -t >/dev/null 2>&1
-    	if [ $? = 0 ]; then
-		set -e
-		invoke-rc.d proftpd start || true
-	else
-		echo "Cannot start proftpd, please check syntax of your configuration file $CONF"
-	fi
+    set +e 
+    proftpd -t >/dev/null 2>&1
+    if [ $? = 0 ]; then
+	set -e
+	invoke-rc.d proftpd start || true
+    else
+	echo "Cannot start proftpd, please check syntax of your configuration file $CONF"
     fi
 fi
 
 #DEBHELPER#
-

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