X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fdnsmasq;fp=src%2Finitscripts%2Finit.d%2Fdnsmasq;h=15db47c18f7d295e78efa9ec0ee873432bb5370a;hp=a02097e4109febedae15ee1dd3b0604001b4dd67;hb=2340d265b1a21f036a04d2ad9649bd7637eeda71;hpb=527bc5af18b7eefab2aac8f27a1c8be71c379b0f diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index a02097e41..15db47c18 100644 --- 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