dnsmasq: Fix appending arguments to the argument list.

[people/teissler/ipfire-2.x.git] / src / initscripts / init.d / dnsmasq

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index a02097e4109febedae15ee1dd3b0604001b4dd67..34eee0c26e8fbb2aa2bab5fe9b098c03d66ba8bd 100644 (file)
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -50,8 +50,8 @@ case "${1}" in
                boot_mesg "Starting Domain Name Service Proxy..."
                
                eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-               ARGS=
-               [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
+               ARGS="$CUSTOM_ARGS"
+               [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN"
                
                echo > /var/ipfire/red/resolv.conf # Clear it
                if [ -e "/var/ipfire/red/dns1" ]; then
@@ -73,8 +73,6 @@ case "${1}" in
                # Add custom forward dns zones.
                ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)"
 
-               ARGS="$ARGS $CUSTOM_ARGS"
-
                loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
                
                if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then