Updated hardcoded ping.ipfire.org ip.

[people/teissler/ipfire-2.x.git] / src / ppp / ip-up

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index 5c456992141b1d87ad6ba20eaf76d2edc47b4fe0..fdd204b93cd402dea5359b1d5465a9263fdd10f5 100644 (file)
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -32,30 +32,34 @@ if [ "$DNS" == "Automatic" ]; then
                echo -n "$MS_DNS1" > /var/ipfire/red/dns1
                echo -n "$MS_DNS2" > /var/ipfire/red/dns2
        else
-               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
+               if [ "$PRIMARY_DNS" == "10.11.12.13" ]; then
                        echo -n "$DNS1" > /var/ipfire/red/dns1
+               else
+                       echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1
+               fi
+               if [ "$SECONDARY_DNS" == "10.11.12.14" ]; then
                        echo -n "$DNS2" > /var/ipfire/red/dns2
+               else
+                       echo -n "$SECONDARY_DNS" > /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
 touch /var/ipfire/red/active
 
+/sbin/ip route replace default via ${IPREMOTE} dev ppp0
 run_subdir ${rc_base}/init.d/networking/red.up/
 
 #Check if gateway has answerd to ping, if not replace with ping.ipfire.org
 TEST=`/usr/bin/ping -c 2 $5 2>/dev/null | tail -2 | head -1 | cut -d"," -f2`;
 
-grep -v "gateway" /etc/hosts > /tmp/hosts
+grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
 
 if [ "$TEST" == " 2 received" ]; then
        #ping the ppp-gateway
@@ -70,9 +74,10 @@ else
            echo "$FIRE gateway" >> /tmp/hosts
        else
            #DNS lookup failed use direct ip
-           echo "85.88.28.125  gateway" >> /tmp/hosts
+           echo "178.63.73.246 gateway" >> /tmp/hosts
        fi
 fi
 mv /tmp/hosts /etc/hosts
 
 [ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up
+