From c925f9e48acabceb5418f2ce4d60b3a487edbbee Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Tue, 30 Apr 2013 17:24:27 +0200 Subject: [PATCH] dnsmasq unit file cleanup - drop forking Type and PIDfile and rather start dnsmasq with "-k" option - drop After syslog.target as this is by default Signed-off-by: Tomas Hozza --- dnsmasq.service | 6 ++---- dnsmasq.spec | 7 ++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dnsmasq.service b/dnsmasq.service index 8ecb7c8..07fa92e 100644 --- a/dnsmasq.service +++ b/dnsmasq.service @@ -1,11 +1,9 @@ [Unit] Description=DNS caching server. -After=syslog.target network.target +After=network.target [Service] -Type=forking -PIDFile=/var/run/dnsmasq.pid -ExecStart=/usr/sbin/dnsmasq +ExecStart=/usr/sbin/dnsmasq -k [Install] WantedBy=multi-user.target diff --git a/dnsmasq.spec b/dnsmasq.spec index a49a3e2..f5f41cc 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -11,7 +11,7 @@ Name: dnsmasq Version: 2.66 -Release: 4%{?extraversion}%{?dist} +Release: 5%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -164,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/dhcp_* %changelog +* Tue Apr 30 2013 Tomas Hozza - 2.66-5 +- dnsmasq unit file cleanup + - drop forking Type and PIDfile and rather start dnsmasq with "-k" option + - drop After syslog.target as this is by default + * Thu Apr 25 2013 Tomas Hozza - 2.66-4 - include several fixes from upstream repo: - Send TCP DNS messages in one packet