src/patches/dnsmasq/001-Debian_init_d_script_fix.patch

   1 From 332c41e2ff533649dc48b6bab00804d795f348f5 Mon Sep 17 00:00:00 2001
   2 From: Simon Kelley <simon@thekelleys.org.uk>
   3 Date: Sun, 1 May 2016 22:36:46 +0100
   4 Subject: [PATCH] Debian init.d script fix.
   5
   6 ---
   7  debian/changelog |  8 +++++---
   8  debian/init      | 14 +++++++-------
   9  2 files changed, 12 insertions(+), 10 deletions(-)
  10
  11 diff --git a/debian/changelog b/debian/changelog
  12 index e727406..8a0341c 100644
  13 --- a/debian/changelog
  14 +++ b/debian/changelog
  15 @@ -3,19 +3,21 @@ dnsmasq (2.76-1) unstable; urgency=low
  16     * New upstream. (closes: #798586)
  17     * Use /run/dnsmasq directly, rather than relying on link from /var/run
  18       to avoid problems before /var is mounted. (closes: #800351)
  19 -
  20 +   * Test for the existance of /usr/share/doc/dnsmasq rather then
  21 +     /etc/dnsmasq.d/README in the daemon startup script. (closes: #819856)
  22 +
  23   -- Simon Kelley <simon@thekelleys.org.uk>  Thur, 10 Sep 2015 23:07:21 +0000
  24
  25  dnsmasq (2.75-1) unstable; urgency=low
  26
  27     * New upstream. (closes: #794095)
  28 -
  29 +
  30   -- Simon Kelley <simon@thekelleys.org.uk>  Thur, 30 Jul 2015 20:58:31 +0000
  31
  32  dnsmasq (2.74-1) unstable; urgency=low
  33
  34     * New upstream. (LP: #1468611)
  35 -
  36 +
  37   -- Simon Kelley <simon@thekelleys.org.uk>  Wed, 15 Jul 2015 21:54:11 +0000
  38
  39  dnsmasq (2.73-2) unstable; urgency=low
  40 diff --git a/debian/init b/debian/init
  41 index 6afe191..10b277c 100644
  42 --- a/debian/init
  43 +++ b/debian/init
  44 @@ -8,7 +8,8 @@
  45  # Description:    DHCP and DNS server
  46  ### END INIT INFO
  47
  48 -set +e   # Don't exit on error status
  49 +# Don't exit on error status
  50 +set +e
  51
  52  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
  53  DAEMON=/usr/sbin/dnsmasq
  54 @@ -29,12 +30,11 @@ if [ -r /etc/default/locale ]; then
  55          export LANG
  56  fi
  57
  58 -# /etc/dnsmasq.d/README is a non-conffile installed by the dnsmasq package.
  59 -# Should the dnsmasq package be removed, the following test ensures that
  60 -# the daemon is no longer started, even if the dnsmasq-base package is
  61 -# still in place.
  62 -test -e /etc/dnsmasq.d/README || exit 0
  63 -
  64 +# The following test ensures the dnsmasq service is not started, when the
  65 +# package 'dnsmasq' is removed but not purged, even if the dnsmasq-base
  66 +# package is still in place.
  67 +test -d /usr/share/doc/dnsmasq || exit 0
  68 +
  69  test -x $DAEMON || exit 0
  70
  71  # Provide skeleton LSB log functions for backports which don't have LSB functions.
  72 --
  73 2.5.5
  74