Add short delay to dialer and fix umts/gprs dns work arround

diff --git a/src/ppp/dialer b/src/ppp/dialer
index 208e3b96776b81c4b3f5d025d87367507ef237a7..c8aad46e7c8cb2583d65ac3bf05e5351476160f6 100644 (file)
--- a/src/ppp/dialer
+++ b/src/ppp/dialer
@@ -88,8 +88,9 @@ my $com = "/usr/sbin/chat -v -r /var/log/connect.log                  \
        OK                      '$speaker'                              \
        OK                      '$add_at2'                              \
        ''                      '$add_at3'                              \
        OK                      '$speaker'                              \
        OK                      '$add_at2'                              \
        ''                      '$add_at3'                              \

+       ''                      'sleep 5'                               \

        TIMEOUT                 '$modemsettings{'TIMEOUT'}'             \
        TIMEOUT                 '$modemsettings{'TIMEOUT'}'             \

-       OK                      '${dial}${telephone}'                   \
+       OK                      '\d${dial}${telephone}'                 \

        CONNECT                 '${btfudge}'                            ";
 
 if ($loginscript)
        CONNECT                 '${btfudge}'                            ";
 
 if ($loginscript)

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index 5c456992141b1d87ad6ba20eaf76d2edc47b4fe0..ab01ad38b71f8eea2216d8e64906cfed615f91db 100644 (file)
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -32,12 +32,15 @@ if [ "$DNS" == "Automatic" ]; then
                echo -n "$MS_DNS1" > /var/ipfire/red/dns1
                echo -n "$MS_DNS2" > /var/ipfire/red/dns2
        else
                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
                        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
                        echo -n "$DNS2" > /var/ipfire/red/dns2

+               else
+                       echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2

                fi
        fi
 else
                fi
        fi
 else