Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debian systemd fixes.

Browse Source
This commit is contained in:
Simon Kelley
2015-02-12 18:30:32 +00:00
parent f4f400776b
commit ee4d1cea92
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
debian/changelog vendored
View File

@@ -6,7 +6,19 @@ dnsmasq (2.73-1) unstable; urgency=low
* Add newline at the end of example config file. (LP: #1416895) * Add newline at the end of example config file. (LP: #1416895)
* Make Debian package build reproducible. (closes: #777323) * 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 dnsmasq (2.72-2) unstable; urgency=low

2
debian/control vendored
View File

@@ -42,5 +42,3 @@ Description: Utilities for manipulating DHCP leases
Small utilities to query a DHCP server's lease database and Small utilities to query a DHCP server's lease database and
remove leases from it. These programs are distributed with dnsmasq remove leases from it. These programs are distributed with dnsmasq
and may not work correctly with other DHCP servers. and may not work correctly with other DHCP servers.

4
debian/init vendored
View File

@@ -293,9 +293,7 @@ case "$1" in
mkdir /var/run/dnsmasq || return 2 mkdir /var/run/dnsmasq || return 2
chown dnsmasq:nogroup /var/run/dnsmasq || return 2 chown dnsmasq:nogroup /var/run/dnsmasq || return 2
fi fi
# Enable DBus by default because we use DBus activation with systemd. exec $DAEMON -x /var/run/dnsmasq/$NAME.pid \
exec $DAEMON --keep-in-foreground --enable-dbus \
-x /var/run/dnsmasq/$NAME.pid \
${MAILHOSTNAME:+ -m $MAILHOSTNAME} \ ${MAILHOSTNAME:+ -m $MAILHOSTNAME} \
${MAILTARGET:+ -t $MAILTARGET} \ ${MAILTARGET:+ -t $MAILTARGET} \
${DNSMASQ_USER:+ -u $DNSMASQ_USER} \ ${DNSMASQ_USER:+ -u $DNSMASQ_USER} \

9
debian/systemd.service vendored
View File

@@ -2,8 +2,8 @@
Description=dnsmasq - A lightweight DHCP and caching DNS server Description=dnsmasq - A lightweight DHCP and caching DNS server
[Service] [Service]
Type=dbus Type=forking
BusName=uk.org.thekelleys.dnsmasq PIDFile=/var/run/dnsmasq/dnsmasq.pid
# Test the config file and refuse starting if it is not valid. # Test the config file and refuse starting if it is not valid.
ExecStartPre=/usr/sbin/dnsmasq --test ExecStartPre=/usr/sbin/dnsmasq --test
@@ -11,11 +11,6 @@ ExecStartPre=/usr/sbin/dnsmasq --test
# We run dnsmasq via the /etc/init.d/dnsmasq script which acts as a # We run dnsmasq via the /etc/init.d/dnsmasq script which acts as a
# wrapper picking up extra configuration files and then execs dnsmasq # wrapper picking up extra configuration files and then execs dnsmasq
# itself, when called with the "systemd-exec" function. # 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 ExecStart=/etc/init.d/dnsmasq systemd-exec
# The systemd-*-resolvconf functions configure (and deconfigure) # The systemd-*-resolvconf functions configure (and deconfigure)