Remove empty nameserver entry from resolv.conf.

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

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 29a59d3eabab4210661b78b919e3fec306e58ecc..0dfb1f4e3b441b0aa77d5f7f96590b2cde91769e 100644 (file)
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -15,16 +15,39 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+SHOW_SRV=1
+
 case "${1}" in
        start)
                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 "
-               [ -e "/var/ipfire/red/active" ] && ARGS+="-r /var/ipfire/red/resolv.conf"
+               [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
+               
+               echo > /var/ipfire/red/resolv.conf # Clear it
+               if [ -e "/var/ipfire/red/dns1" ]; then
+                   DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null)
+                   if [ ! -z ${DNS1} ]; then
+                       echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf
+                   fi
+               fi
+               if [ -e "/var/ipfire/red/dns2" ]; then
+                   DNS2=$(cat /var/ipfire/red/dns2 2>/dev/null)
+                   if [ ! -z ${DNS2} ]; then
+                       echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf
+                   fi
+               fi
+               [ -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`"
                
                loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
+               
+               if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then
+                   boot_mesg "Using DNS server(s): ${DNS1} ${DNS2}"
+                   boot_mesg_flush
+               fi
                ;;
 
        stop)