aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/base-files/default/etc/hotplug.d/net/10-net5
-rwxr-xr-xpackage/base-files/default/lib/network/config.sh3
-rw-r--r--package/ppp/files/ppp.sh1
3 files changed, 3 insertions, 6 deletions
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 176b9372f4..4e5c3041b5 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/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
- 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"
diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index 3e18db1b43..18f794a31b 100755
--- a/package/base-files/default/lib/network/config.sh
+++ b/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 ifname "$CONFIG_SECTION" ifname
+ config_set "$CONFIG_SECTION" device "$ifname"
case "$iftype" in
bridge)
- config_get ifname "$CONFIG_SECTION" ifname
config_set "$CONFIG_SECTION" ifnames "$ifname"
config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
;;
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 51a19555e8..343223af1b 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,7 +1,6 @@
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"
}