projects
/
lede.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c03dcf1
)
save the real configured interface name in the 'device' variable when running scan_in...
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 9 Oct 2006 12:35:31 +0000
(12:35 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 9 Oct 2006 12:35:31 +0000
(12:35 +0000)
SVN-Revision: 4983
openwrt/package/base-files/default/etc/hotplug.d/net/10-net
patch
|
blob
|
history
openwrt/package/base-files/default/lib/network/config.sh
patch
|
blob
|
history
openwrt/package/ppp/files/ppp.sh
patch
|
blob
|
history
diff --git
a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
index 176b9372f426f80454e65fce272a3d684d1467cb..4e5c3041b5db665d7bab807154c000511afcb7a2 100644
(file)
--- a/
openwrt/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/
openwrt/package/base-files/default/etc/hotplug.d/net/10-net
@@
-9,10
+9,7
@@
addif() {
# find all vlan configurations for this interface and set them up as well
for ifc in $interfaces; do
config_get iftype "$ifc" type
# find all vlan configurations for this interface and set them up as well
for ifc in $interfaces; do
config_get iftype "$ifc" type
- case "$iftype" in
- bridge) config_get ifs "$ifc" ifnames;;
- *) config_get ifs "$ifc" ifname;;
- esac
+ config_get ifs "$ifc" device
for dev in $ifs; do
[ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
add_vlan "$dev"
for dev in $ifs; do
[ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
add_vlan "$dev"
diff --git
a/openwrt/package/base-files/default/lib/network/config.sh
b/openwrt/package/base-files/default/lib/network/config.sh
index 3e18db1b43b608b138abee3e0e8915977d880dd1..18f794a31b25a1c32d9366983d6d6cfaee30969a 100755
(executable)
--- a/
openwrt/package/base-files/default/lib/network/config.sh
+++ b/
openwrt/package/base-files/default/lib/network/config.sh
@@
-33,9
+33,10
@@
scan_interfaces() {
config_get proto "$CONFIG_SECTION" proto
append interfaces "$CONFIG_SECTION"
config_get iftype "$CONFIG_SECTION" type
config_get proto "$CONFIG_SECTION" proto
append interfaces "$CONFIG_SECTION"
config_get iftype "$CONFIG_SECTION" type
+ config_get ifname "$CONFIG_SECTION" ifname
+ config_set "$CONFIG_SECTION" device "$ifname"
case "$iftype" in
bridge)
case "$iftype" in
bridge)
- config_get ifname "$CONFIG_SECTION" ifname
config_set "$CONFIG_SECTION" ifnames "$ifname"
config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
;;
config_set "$CONFIG_SECTION" ifnames "$ifname"
config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
;;
diff --git
a/openwrt/package/ppp/files/ppp.sh
b/openwrt/package/ppp/files/ppp.sh
index 51a19555e8bc9e400dd16fd5b6aa44efdd10cd60..343223af1b96e41330242a9e3471cb6dc564eab6 100644
(file)
--- a/
openwrt/package/ppp/files/ppp.sh
+++ b/
openwrt/package/ppp/files/ppp.sh
@@
-1,7
+1,6
@@
scan_ppp() {
config_get ifname "$1" ifname
pppdev="${pppdev:-0}"
scan_ppp() {
config_get ifname "$1" ifname
pppdev="${pppdev:-0}"
- config_set "$1" device "$ifname"
config_set "$1" ifname "ppp$pppdev"
config_set "$1" unit "$pppdev"
}
config_set "$1" ifname "ppp$pppdev"
config_set "$1" unit "$pppdev"
}