From 332c41e2ff533649dc48b6bab00804d795f348f5 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Sun, 1 May 2016 22:36:46 +0100 Subject: [PATCH] Debian init.d script fix. --- debian/changelog | 8 +++++--- debian/init | 14 +++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index e727406..8a0341c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,19 +3,21 @@ dnsmasq (2.76-1) unstable; urgency=low * New upstream. (closes: #798586) * Use /run/dnsmasq directly, rather than relying on link from /var/run 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 Thur, 10 Sep 2015 23:07:21 +0000 dnsmasq (2.75-1) unstable; urgency=low * New upstream. (closes: #794095) - + -- Simon Kelley Thur, 30 Jul 2015 20:58:31 +0000 dnsmasq (2.74-1) unstable; urgency=low * New upstream. (LP: #1468611) - + -- Simon Kelley Wed, 15 Jul 2015 21:54:11 +0000 dnsmasq (2.73-2) unstable; urgency=low diff --git a/debian/init b/debian/init index 6afe191..10b277c 100644 --- a/debian/init +++ b/debian/init @@ -8,7 +8,8 @@ # Description: DHCP and DNS server ### 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 DAEMON=/usr/sbin/dnsmasq @@ -29,12 +30,11 @@ 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 - +# The following test ensures the dnsmasq service is not started, when the +# package 'dnsmasq' is removed but not purged, even if the dnsmasq-base +# package is still in place. +test -d /usr/share/doc/dnsmasq || exit 0 + test -x $DAEMON || exit 0 # Provide skeleton LSB log functions for backports which don't have LSB functions.