Remove empty nameserver entry from resolv.conf.

diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files
index f1526f038d9a1f0d480a1face85f438154c8372d..5b9c93405783b2cbb0238cbfe8ca71e6debbf579 100644 (file)
--- a/config/rootfiles/core/39/filelists/files
+++ b/config/rootfiles/core/39/filelists/files
@@ -1,4 +1,5 @@
 etc/system-release
 etc/system-release

+etc/rc.d/init.d/dnsmasq

 etc/rc.d/init.d/networking/red
 etc/rc.d/helper/getdnsfromdhcpc.pl
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 etc/rc.d/init.d/networking/red
 etc/rc.d/helper/getdnsfromdhcpc.pl
 srv/web/ipfire/cgi-bin/pppsetup.cgi

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index eaa55cef923a30f1f5780495613251ec5550c735..0dfb1f4e3b441b0aa77d5f7f96590b2cde91769e 100644 (file)
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -28,11 +28,15 @@ case "${1}" in
                echo > /var/ipfire/red/resolv.conf # Clear it
                if [ -e "/var/ipfire/red/dns1" ]; then
                    DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null)
                echo > /var/ipfire/red/resolv.conf # Clear it
                if [ -e "/var/ipfire/red/dns1" ]; then
                    DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null)

-                   echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf
+                   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)
                fi
                if [ -e "/var/ipfire/red/dns2" ]; then
                    DNS2=$(cat /var/ipfire/red/dns2 2>/dev/null)

-                   echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf
+                   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"
                
                fi
                [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"