diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2014-05-04 21:45:26 +0100 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2014-05-04 21:45:26 +0100 |
| commit | 8aa999ef69f3978faa4788e390edb4ed44dfc11e (patch) | |
| tree | b0bf767d65fa891177fcf3b83c9a77ed68000081 | |
| parent | 20b215f2939f1139560ace68851a8c6bbb968dc1 (diff) | |
| download | dnsmasq-8aa999ef69f3978faa4788e390edb4ed44dfc11e.tar.gz | |
Debian packaging fixes.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/init | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6938964..3c98631 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +dnsmasq (2.70-2) unstable; urgency=low + + * Ensure daemon not stared if dnsmasq package has been removed, + even if dnsmasq-base is still installed. (closes: #746941) + * Tidy cruft in initscript. (closes: #746940) + + -- Simon Kelley <simon@thekelleys.org.uk> Sun, 04 May 2014 21:34:11 +0000 + dnsmasq (2.70-1) unstable; urgency=low * New upstream. diff --git a/debian/init b/debian/init index 6f35dd1..3db7dca 100644 --- a/debian/init +++ b/debian/init @@ -29,6 +29,12 @@ if [ -r /etc/default/locale ]; then export LANG fi +# /etc/dnsmasq.d/README is a non-conffile installed by the dnsmasq package. +# Should the dnsmasq package be removed, the following test ensures that +# the daemon is no longer started, even if the dnsmasq-base package is +# still in place. +test -e /etc/dnsmasq.d/README || exit 0 + test -x $DAEMON || exit 0 # Provide skeleton LSB log functions for backports which don't have LSB functions. @@ -152,9 +158,6 @@ stop() # 2 if daemon could not be stopped # other if a failure occurred start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile /var/run/dnsmasq/$NAME.pid --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - return "$RETVAL" } stop_resolvconf() |