Debian change: write pid-file even using systemd.

debian/changelog

@@ -1,3 +1,10 @@
+dnsmasq (2.70-3) unstable; urgency=low
+
+   * Write a pid-file, even when being started using systemd, since
+     other components may wish to signal dnsmasq.
+	
+ -- Simon Kelley <simon@thekelleys.org.uk>  Fri, 09 May 2014 20:45:11 +0000
+
 dnsmasq (2.70-2) unstable; urgency=low
 
    * Ensure daemon not stared if dnsmasq package has been removed,

debian/init

@@ -277,9 +277,8 @@ case "$1" in
 	stop_resolvconf
 	;;
   systemd-exec)
-#  --pid-file without argument disables writing a PIDfile, we don't need one with sytemd.
 # Enable DBus by default because we use DBus activation with systemd.
-	exec $DAEMON --keep-in-foreground --pid-file --enable-dbus \
+	exec $DAEMON --keep-in-foreground --enable-dbus \
 	    ${MAILHOSTNAME:+ -m $MAILHOSTNAME} \
 	    ${MAILTARGET:+ -t $MAILTARGET} \
 	    ${DNSMASQ_USER:+ -u $DNSMASQ_USER} \

debian/systemd.service

@@ -13,9 +13,8 @@ ExecStartPre=/usr/sbin/dnsmasq --test
 # itself, when called with the "systemd-exec" function.
 #
 # It also adds the command-line flags
-#    --keep-in-foreground --pid-file --enable-dbus 
+#    --keep-in-foreground --enable-dbus 
-# to disable writing a pid-file (not needed with systemd) and 
+# to enable DBus by default because we use DBus activation.
-# enable DBus by default because we use DBus activation.
 #
 ExecStart=/etc/init.d/dnsmasq systemd-exec