From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 31 Mar 2015 08:09:46 +0000 (+0200)
Subject: dnsmasq: fix initskript
X-Git-Tag: v2.17-core91~158
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0d573e226f956e32035a41674e6f79e169305172

dnsmasq: fix initskript

-add timestamp filename
-pull user config after define default parameter
---

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 4e37925171..ce7689f4e1 100644
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -15,18 +15,19 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-# Pull custom configuration file
-if [ -e "/etc/sysconfig/dnsmasq" ]; then
-	. /etc/sysconfig/dnsmasq
-fi
-
 CACHE_SIZE=2500
 ENABLE_DNSSEC=1
 SHOW_SRV=1
 TRUST_ANCHOR=".,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5"
+TIMESTAMP_FILE="/var/ipfire/dns/dnssec-timestamp"
+
+# Pull custom configuration file
+if [ -e "/etc/sysconfig/dnsmasq" ]; then
+	. /etc/sysconfig/dnsmasq
+fi
 
 function dnssec_args() {
-	local cmdline="--dnssec --dnssec-timestamp"
+	local cmdline="--dnssec --dnssec-timestamp ${TIMESTAMP_FILE}"
 
 	if [ -n "${TRUST_ANCHOR}" ]; then
 		cmdline="${cmdline} --trust-anchor=${TRUST_ANCHOR}"