mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

save the real configured interface name in the 'device' variable when running scan_interfaces() - fixes pppoe problems

Browse Source 
SVN-Revision: 4983
This commit is contained in:
Felix Fietkau 2006-10-09 12:35:31 +00:00
parent c03dcf1a76
commit e9c850b284
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,10 +9,7 @@ addif() {
# find all vlan configurations for this interface and set them up as well # find all vlan configurations for this interface and set them up as well
for ifc in $interfaces; do for ifc in $interfaces; do
config_get iftype "$ifc" type config_get iftype "$ifc" type
case "$iftype" in config_get ifs "$ifc" device
bridge) config_get ifs "$ifc" ifnames;;
*) config_get ifs "$ifc" ifname;;
esac
for dev in $ifs; do for dev in $ifs; do
[ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && { [ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
add_vlan "$dev" add_vlan "$dev"

3
openwrt/package/base-files/default/lib/network/config.sh
View File

@ -33,9 +33,10 @@ scan_interfaces() {
config_get proto "$CONFIG_SECTION" proto config_get proto "$CONFIG_SECTION" proto
append interfaces "$CONFIG_SECTION" append interfaces "$CONFIG_SECTION"
config_get iftype "$CONFIG_SECTION" type config_get iftype "$CONFIG_SECTION" type
config_get ifname "$CONFIG_SECTION" ifname
config_set "$CONFIG_SECTION" device "$ifname"
case "$iftype" in case "$iftype" in
bridge) bridge)
config_get ifname "$CONFIG_SECTION" ifname
config_set "$CONFIG_SECTION" ifnames "$ifname" config_set "$CONFIG_SECTION" ifnames "$ifname"
config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION" config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
;; ;;

1
openwrt/package/ppp/files/ppp.sh
View File

@ -1,7 +1,6 @@
scan_ppp() { scan_ppp() {
config_get ifname "$1" ifname config_get ifname "$1" ifname
pppdev="${pppdev:-0}" pppdev="${pppdev:-0}"
config_set "$1" device "$ifname"
config_set "$1" ifname "ppp$pppdev" config_set "$1" ifname "ppp$pppdev"
config_set "$1" unit "$pppdev" config_set "$1" unit "$pppdev"
} }