more reliable fix for handling ppp

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6356 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net
index 9b72338..77eb6da 100644 (file)
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -3,6 +3,11 @@
 include /lib/network
 
 addif() {
 include /lib/network
 
 addif() {

+       # PPP devices are configured by pppd, no need to run setup_interface here
+       case "$INTERFACE" in
+               ppp*) return 0;;
+       esac
+

        scan_interfaces
        local cfg="$(find_config "$INTERFACE")"
 
        scan_interfaces
        local cfg="$(find_config "$INTERFACE")"
 

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 5eb007d..0bd75fc 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -3,10 +3,6 @@ scan_ppp() {
        pppdev="${pppdev:-0}"
        config_set "$1" ifname "ppp$pppdev"
        config_set "$1" unit "$pppdev"
        pppdev="${pppdev:-0}"
        config_set "$1" ifname "ppp$pppdev"
        config_set "$1" unit "$pppdev"

-       
-       # set 'auto' to 0, so that hotplug does not attempt to
-       # reconfigure an interface that is managed by pppd
-       config_set "$1" auto 0

 }
 
 start_pppd() {
 }
 
 start_pppd() {