KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 10715
This commit is contained in:
Felix Fietkau 2008-04-02 21:27:28 +00:00
parent 1d3ed2fca0
commit f4f7d687f0
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" append interfaces "$CONFIG_SECTION"
config_get iftype "$CONFIG_SECTION" type config_get iftype "$CONFIG_SECTION" type
config_get ifname "$CONFIG_SECTION" ifname 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 case "$iftype" in
bridge) bridge)
config_set "$CONFIG_SECTION" ifnames "$ifname" config_set "$CONFIG_SECTION" ifnames "${device:-$ifname}"
config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION" config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
;; ;;
esac esac
@ -113,6 +114,15 @@ prepare_interface() {
return 0 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() { setup_interface() {
local iface="$1" local iface="$1"
local config="$2" local config="$2"
@ -140,7 +150,7 @@ setup_interface() {
config_get macaddr "$config" macaddr config_get macaddr "$config" macaddr
grep "$iface:" /proc/net/dev > /dev/null && \ grep "$iface:" /proc/net/dev > /dev/null && \
$DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up $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" pidfile="/var/run/$iface.pid"
case "$proto" in 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 # make sure the network state references the correct ifname
scan_ppp "$config" scan_ppp "$config"
config_get ifname "$config" ifname config_get ifname "$config" ifname
uci set "/var/state/network.$config.ifname=$ifname" set_interface_ifname "$config" "$ifname"
config_get mtu "$cfg" mtu config_get mtu "$cfg" mtu
mtu=${mtu:-1492} mtu=${mtu:-1492}