dnsmasq: Put custom arguments first.

diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files
index a1ef1bfdd5789aea1b0e49eec58e6abb1f28325b..b56a318e303ee5c13814ed5b963b7fd5efd27020 100644 (file)
--- a/config/rootfiles/core/73/filelists/files
+++ b/config/rootfiles/core/73/filelists/files
@@ -1,5 +1,6 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/squid
 srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat
 srv/web/ipfire/cgi-bin/proxy.cgi

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index a02097e4109febedae15ee1dd3b0604001b4dd67..15db47c18f7d295e78efa9ec0ee873432bb5370a 100644 (file)
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -50,7 +50,7 @@ case "${1}" in
                boot_mesg "Starting Domain Name Service Proxy..."
                
                eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-               ARGS=
+               ARGS="$CUSTOM_ARGS"
                [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
                
                echo > /var/ipfire/red/resolv.conf # Clear it
@@ -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