From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 13 May 2009 16:41:01 +0000 (+0200)
Subject: Work around for Bad DNS Servers at UMTS-Connections
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=28ec28bcbe78d60e62796a0a9b064800db8e4171

Work around for Bad DNS Servers at UMTS-Connections
Change gateway ip to currect ip
Remove Error (3min wait) at startup if the first connection try fail...
---

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index a63aea05c..74ff3fdc8 100644
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -59,7 +59,7 @@ case "$1" in
 		fi
 
 		# Enable sensors plugin if sensors found
-		if [ $( sensors 2>&1 | grep "No sensors found!" | wc -l ) == "1" ]; then
+		if [ "$( sensors 2>&1 | grep 'No sensors found!' | wc -l )" == "1" ]; then
 			sed -i -e "s|^LoadPlugin sensors|#LoadPlugin sensors|g" /etc/collectd.conf
 		else
 			sed -i -e "s|^#LoadPlugin sensors|LoadPlugin sensors|g" /etc/collectd.conf
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 6f9fcd064..1a7958306 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -366,6 +366,7 @@ case "${1}" in
 			/usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
 			/etc/rc.d/init.d/connectd start
 			/etc/rc.d/init.d/collectd start
+			exit 0
 		fi
 		;;
 
diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index 9168eef40..5c4569921 100644
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -32,14 +32,19 @@ if [ "$DNS" == "Automatic" ]; then
 		echo -n "$MS_DNS1" > /var/ipfire/red/dns1
 		echo -n "$MS_DNS2" > /var/ipfire/red/dns2
 	else
-		echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1
-		echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2
+		if [ "$PRIMARY_DNS" != "10.11.12.13" || "$SECONDARY_DNS" != "10.11.12.14" ]; then
+			echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1
+			echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2
+		else
+			echo -n "$DNS1" > /var/ipfire/red/dns1
+			echo -n "$DNS2" > /var/ipfire/red/dns2
+		fi
 	fi
 else
 	echo -n "$DNS1" > /var/ipfire/red/dns1
 	echo -n "$DNS2" > /var/ipfire/red/dns2
 fi
-
+7
 echo -n "$1" > /var/ipfire/red/iface
 echo -n "$4" > /var/ipfire/red/local-ipaddress
 echo -n "$5" > /var/ipfire/red/remote-ipaddress
@@ -65,7 +70,7 @@ else
 	    echo "$FIRE	gateway" >> /tmp/hosts
 	else
 	    #DNS lookup failed use direct ip
-	    echo "85.88.28.124	gateway" >> /tmp/hosts
+	    echo "85.88.28.125	gateway" >> /tmp/hosts
 	fi
 fi
 mv /tmp/hosts /etc/hosts