From 72ba11797cb3da974fbf8b04a8e6059d594a239b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Thu, 8 Apr 2021 08:36:46 +0200 Subject: [PATCH] Change default pid file into run directory --- dnsmasq.service | 2 +- dnsmasq.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dnsmasq.service b/dnsmasq.service index f7ec15b..08faf75 100644 --- a/dnsmasq.service +++ b/dnsmasq.service @@ -3,7 +3,7 @@ Description=DNS caching server. After=network.target [Service] -ExecStart=/usr/sbin/dnsmasq --pid-file=/run/dnsmasq.pid +ExecStart=/usr/sbin/dnsmasq Type=forking PIDFile=/run/dnsmasq.pid diff --git a/dnsmasq.spec b/dnsmasq.spec index 51bc8ca..d641f55 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -106,6 +106,7 @@ done #set default user /group in src/config.h sed -i 's|#define CHUSER "nobody"|#define CHUSER "dnsmasq"|' src/config.h sed -i 's|#define CHGRP "dip"|#define CHGRP "dnsmasq"|' src/config.h +sed -i "s|\(#\s*define RUNFILE\) \"/var/run/dnsmasq.pid\"|\1 \"%{_rundir}/dnsmasq.pid\"|" src/config.h # optional parts sed -i 's|^COPTS[[:space:]]*=|\0 -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_DNSSEC|' Makefile