From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 1 Aug 2010 17:08:29 +0000 (+0200)
Subject: Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~140
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a63fbb6d67851e989e44240f60126c083ec91686;hp=33e502304f75fcc7ab814a3b7cb1ac2e18da4c5b

Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
---

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 0dfb1f4e3b..11859214b9 100644
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -15,6 +15,11 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+# Pull custom configuration file
+if [ -e "/etc/sysconfig/dnsmasq" ]; then
+	. /etc/sysconfig/dnsmasq
+fi
+
 SHOW_SRV=1
 
 case "${1}" in
@@ -41,7 +46,8 @@ case "${1}" in
 		[ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"
 		
 		ARGS="$ARGS --domain=`cat /var/ipfire/main/settings |grep DOMAIN |cut -d = -f 2`"
-		
+		ARGS="$ARGS $CUSTOM_ARGS"
+
 		loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
 		
 		if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then