qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 03:13:20 +02:00
Code

fix interface enumeration issues related to /var/state/network (thx to fish for debugging this)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10715 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2008-04-02 21:27:28 +00:00
parent c50d2a30f6
commit fd00f35a4f
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/base-files/files/lib/network/config.sh
View File

@ -40,10 +40,11 @@ scan_interfaces() {
append interfaces "$CONFIG_SECTION"
config_get iftype "$CONFIG_SECTION" type
config_get ifname "$CONFIG_SECTION" ifname
config_set "$CONFIG_SECTION" device "$ifname"
config_get device "$CONFIG_SECTION" device
config_set "$CONFIG_SECTION" device "${device:-$ifname}"
case "$iftype" in
bridge)
config_set "$CONFIG_SECTION" ifnames "$ifname"
config_set "$CONFIG_SECTION" ifnames "${device:-$ifname}"
config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
;;
esac
@ -113,6 +114,15 @@ prepare_interface() {
return 0
}
set_interface_ifname() {
local config="$1"
local ifname="$2"
config_get device "$1" device
uci_set_state "network.$config.ifname=$ifname"
uci_set_state "network.$config.device=$device"
}
setup_interface() {
local iface="$1"
local config="$2"
@ -140,7 +150,7 @@ setup_interface() {
config_get macaddr "$config" macaddr
grep "$iface:" /proc/net/dev > /dev/null && \
$DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
uci_set_state network "$config" ifname "$iface"
set_interface_ifname "$config" "$iface"
pidfile="/var/run/$iface.pid"
case "$proto" in

2
package/ppp/files/pppoe.sh
View File

@ -13,7 +13,7 @@ setup_interface_pppoe() {
# make sure the network state references the correct ifname
scan_ppp "$config"
config_get ifname "$config" ifname
uci set "/var/state/network.$config.ifname=$ifname"
set_interface_ifname "$config" "$ifname"
config_get mtu "$cfg" mtu
mtu=${mtu:-1492}