Commit 8aa999ef authored by Simon Kelley's avatar Simon Kelley

Debian packaging fixes.

parent 20b215f2
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 dnsmasq (2.70-1) unstable; urgency=low
* New upstream. * New upstream.
......
...@@ -29,6 +29,12 @@ if [ -r /etc/default/locale ]; then ...@@ -29,6 +29,12 @@ if [ -r /etc/default/locale ]; then
export LANG export LANG
fi 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 test -x $DAEMON || exit 0
# Provide skeleton LSB log functions for backports which don't have LSB functions. # Provide skeleton LSB log functions for backports which don't have LSB functions.
...@@ -152,9 +158,6 @@ stop() ...@@ -152,9 +158,6 @@ stop()
# 2 if daemon could not be stopped # 2 if daemon could not be stopped
# other if a failure occurred # other if a failure occurred
start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile /var/run/dnsmasq/$NAME.pid --name $NAME 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() stop_resolvconf()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment