more fixes for the network scripts

[openwrt.git] / package / base-files / default / sbin / ifup

diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index 0d75cef..67e01a3 100755 (executable)
--- a/package/base-files/default/sbin/ifup
+++ b/package/base-files/default/sbin/ifup
@@ -14,14 +14,17 @@ if=$(nvram get ${type}_ifname)
 
 case "$if_proto" in
        pppoa) hotplug_dev register atm0; exit 0 ;;
-       pppoe) 
-               [ "$(nvram get pppoe_atm)" = 1 ] && {
+       pppoe)
+               ifconfig nas0 2>&- >&- || {
                        hotplug_dev register atm0
-                       exit
+                       exit 0
                }
        ;;
+       none|"") exit 0;;
 esac
 
+[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)"
+
 if [ "${if%%[0-9]}" = "br" ]; then
        for sif in $(nvram get ${type}_ifnames); do
                hotplug_dev register "$sif"