X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/676c017ecfced2e37aeec176f8aa6b9df90024f3..95e7b381e96d1f6e3108500dec66d980739ca058:/package/base-files/default/sbin/ifup

diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index a86a7671e..35b2fc4cd 100755
--- a/package/base-files/default/sbin/ifup
+++ b/package/base-files/default/sbin/ifup
@@ -1,36 +1,21 @@
 #!/bin/sh
-[ $# = 0 ] && { echo "  $0 <group>"; exit; }
-. /etc/functions.sh
-. /etc/config/network
+# Copyright (C) 2006 OpenWrt.org
 
-ifdown $1
+. /sbin/ifdown "$@"
 
-debug "### ifup $type ###"
-type=$1
-
-eval "if_proto=\"\${${type}_proto}\""
-eval "if=\"\${${type}_ifname}\""
-[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\""
-
-case "$if_proto" in
-	pppoa) hotplug_dev register atm0; exit 0 ;;
-	pppoe)
-		# PPPoE over ATM
-		[ "$if" = "nas0" ] && {
-			ifconfig nas0 2>&- >&- || {
-				hotplug_dev register atm0
-				exit 0
-			}
-		}
-	;;
-	none|"") exit 0;;
+config_get iftype "$1" type
+case "$iftype" in
+	bridge) config_get ifname "$1" ifnames;;
+	*) config_get ifname "$1" ifname;;
 esac
 
-if [ "${if%%[0-9]}" = "br" ]; then
-	eval "ifnames=\"\${${type}_ifnames}\""
-	for sif in $ifnames; do
-		hotplug_dev register "$sif"
-	done
-else
-	hotplug_dev register "$if"
-fi
+for dev in $ifname; do
+	brctl show | grep "$dev" >/dev/null && {
+		# interface is still part of a bridge, correct that
+
+		for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
+			brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
+		done
+	}
+	setup_interface "$dev" "$1"
+done