From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 8 Jul 2010 22:34:11 +0000 (+0200)
Subject: Remove empty nameserver entry from resolv.conf.
X-Git-Tag: v2.9-beta1~171^2~8^2~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=2789f3574dd4f66749b9fae6e84224ccee1c1d52

Remove empty nameserver entry from resolv.conf.
---

diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files
index f1526f038d..5b9c934057 100644
--- a/config/rootfiles/core/39/filelists/files
+++ b/config/rootfiles/core/39/filelists/files
@@ -1,4 +1,5 @@
 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
diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index eaa55cef92..0dfb1f4e3b 100644
--- 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 "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)
-		    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"