dnsmasq: Put custom arguments first.

This commit is contained in:
Michael Tremer
2013-09-02 19:01:44 +02:00
parent 527bc5af18
commit 2340d265b1
2 changed files with 2 additions and 3 deletions

View File

@@ -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