* Add newline at the end of example config file. (LP: #1416895)
* Make Debian package build reproducible. (closes: #777323)
- -- Simon Kelley <simon@thekelleys.org.uk> Mon, 09 Feb 2015 11:50:42 +0000
+ -- Simon Kelley <simon@thekelleys.org.uk> Wed, 11 Feb 2015 21:59:42 +0000
+
+dnsmasq (2.72-3) unstable; urgency=medium
+
+ * debian/systemd.service: switch from Type=dbus to Type=forking.
+ dnsmasq does not depend on dbus, but Type=dbus systemd services cannot
+ work without it. (Closes: #769486, #776530)
+ - debian/init: when called with systemd-exec argument, let dnsmasq
+ go into the background, so Type=forking can detect when it is ready
+ * Remove line containing only whitespace in debian/contol.
+ (closes: #777571)
+
+ -- Simon Kelley <simon@thekelleys.org.uk> Wed, 11 Feb 2015 21:56:12 +0000
dnsmasq (2.72-2) unstable; urgency=low
Small utilities to query a DHCP server's lease database and
remove leases from it. These programs are distributed with dnsmasq
and may not work correctly with other DHCP servers.
-
-
mkdir /var/run/dnsmasq || return 2
chown dnsmasq:nogroup /var/run/dnsmasq || return 2
fi
-# Enable DBus by default because we use DBus activation with systemd.
- exec $DAEMON --keep-in-foreground --enable-dbus \
- -x /var/run/dnsmasq/$NAME.pid \
+ exec $DAEMON -x /var/run/dnsmasq/$NAME.pid \
${MAILHOSTNAME:+ -m $MAILHOSTNAME} \
${MAILTARGET:+ -t $MAILTARGET} \
${DNSMASQ_USER:+ -u $DNSMASQ_USER} \
Description=dnsmasq - A lightweight DHCP and caching DNS server
[Service]
-Type=dbus
-BusName=uk.org.thekelleys.dnsmasq
+Type=forking
+PIDFile=/var/run/dnsmasq/dnsmasq.pid
# Test the config file and refuse starting if it is not valid.
ExecStartPre=/usr/sbin/dnsmasq --test
# We run dnsmasq via the /etc/init.d/dnsmasq script which acts as a
# wrapper picking up extra configuration files and then execs dnsmasq
# itself, when called with the "systemd-exec" function.
-#
-# It also adds the command-line flags
-# --keep-in-foreground --enable-dbus
-# to enable DBus by default because we use DBus activation.
-#
ExecStart=/etc/init.d/dnsmasq systemd-exec
# The systemd-*-resolvconf functions configure (and deconfigure)