Commit 332c41e2 authored by Simon Kelley's avatar Simon Kelley

Debian init.d script fix.

parent 2c0c36f5
...@@ -3,19 +3,21 @@ dnsmasq (2.76-1) unstable; urgency=low ...@@ -3,19 +3,21 @@ dnsmasq (2.76-1) unstable; urgency=low
* New upstream. (closes: #798586) * New upstream. (closes: #798586)
* Use /run/dnsmasq directly, rather than relying on link from /var/run * Use /run/dnsmasq directly, rather than relying on link from /var/run
to avoid problems before /var is mounted. (closes: #800351) to avoid problems before /var is mounted. (closes: #800351)
* Test for the existance of /usr/share/doc/dnsmasq rather then
/etc/dnsmasq.d/README in the daemon startup script. (closes: #819856)
-- Simon Kelley <simon@thekelleys.org.uk> Thur, 10 Sep 2015 23:07:21 +0000 -- Simon Kelley <simon@thekelleys.org.uk> Thur, 10 Sep 2015 23:07:21 +0000
dnsmasq (2.75-1) unstable; urgency=low dnsmasq (2.75-1) unstable; urgency=low
* New upstream. (closes: #794095) * New upstream. (closes: #794095)
-- Simon Kelley <simon@thekelleys.org.uk> Thur, 30 Jul 2015 20:58:31 +0000 -- Simon Kelley <simon@thekelleys.org.uk> Thur, 30 Jul 2015 20:58:31 +0000
dnsmasq (2.74-1) unstable; urgency=low dnsmasq (2.74-1) unstable; urgency=low
* New upstream. (LP: #1468611) * New upstream. (LP: #1468611)
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 15 Jul 2015 21:54:11 +0000 -- Simon Kelley <simon@thekelleys.org.uk> Wed, 15 Jul 2015 21:54:11 +0000
dnsmasq (2.73-2) unstable; urgency=low dnsmasq (2.73-2) unstable; urgency=low
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
# Description: DHCP and DNS server # Description: DHCP and DNS server
### END INIT INFO ### END INIT INFO
set +e # Don't exit on error status # Don't exit on error status
set +e
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/dnsmasq DAEMON=/usr/sbin/dnsmasq
...@@ -29,12 +30,11 @@ if [ -r /etc/default/locale ]; then ...@@ -29,12 +30,11 @@ 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. # The following test ensures the dnsmasq service is not started, when the
# Should the dnsmasq package be removed, the following test ensures that # package 'dnsmasq' is removed but not purged, even if the dnsmasq-base
# the daemon is no longer started, even if the dnsmasq-base package is # package is still in place.
# still in place. test -d /usr/share/doc/dnsmasq || exit 0
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.
......
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