more fixes for the network scripts

SVN-Revision: 2537

openwrt/package/base-files/default/etc/hotplug.d/net/10-net

@@ -23,22 +23,21 @@ find_name()
 		IFTYPE="${ifname}"
 		IFPROTO="$(nvram get ${IFTYPE}_proto)"
 		IFACE="$(nvram get ${IFTYPE}_ifname)"
-		[ -z "$IFPROTO" -o "$IFPROTO" = "none" ] || {
-			[ "${IFACE}" = "$INTERFACE" ] && return 0
-			case "$IFPROTO" in
-				static|dhcp)
-					[ "${IFACE%%[0-9]*}" = "br" ] && {
-						for part in $(nvram get ${IFTYPE}_ifnames); do
-							[ "$part" = "$INTERFACE" ] && return 0
-						done
-					}
-				;;
-				*)
-					[ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
-					  -a -x /sbin/ifup.${IFPROTO} ] && return 0
-				;;
-			esac
-		}
+		case "$IFPROTO" in
+			""|none);;
+			static|dhcp)
+				[ "${IFACE}" = "$INTERFACE" ] && return 0
+				[ "${IFACE%%[0-9]*}" = "br" ] && {
+					for part in $(nvram get ${IFTYPE}_ifnames); do
+						[ "$part" = "$INTERFACE" ] && return 0
+					done
+				}
+			;;
+			*)
+				[ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
+				  -a -x /sbin/ifup.${IFPROTO} ] && return 0
+			;;
+		esac
 	done
 	IFACE=""
 	IFTYPE=""
@@ -156,12 +155,11 @@ do_register()
 			fi
 		}
 	else 
-		do_ifup "$IFPROTO" "$IFTYPE" "$if"
+		[ "${INTERFACE%%[0-9]*}" = "ppp" ] || do_ifup "$IFPROTO" "$IFTYPE" "$if"
 	fi
 }
 
 do_unregister() {
-	[ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
 	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && find_name
 	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && return 0
 	
@@ -175,13 +173,14 @@ do_unregister() {
 	
 	case "$IFPROTO" in
 		pppoe|pppoa|pptp) 
-			killall ifup.${IFPROTO} 2>&- >&-
 			killall pppd 2>&- >&-
 		;;
 		dhcp)
 			[ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&-
 		;;
 	esac
+
+	[ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
 }
 
 case "$ACTION" in

openwrt/package/base-files/default/sbin/ifdown

@@ -15,6 +15,8 @@ case "$if_proto" in
 	""|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 unregister "$sif"

openwrt/package/base-files/default/sbin/ifup

@@ -23,6 +23,8 @@ case "$if_proto" in
 	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"