From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 2 Feb 2012 23:01:02 +0000 (+0000)
Subject: netifd: fix legacy scripts that expect the ifname option to be mapped to the device... 
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/e27bf76f82aec01a7065cbd2d9ba7fdba18ac058

netifd: fix legacy scripts that expect the ifname option to be mapped to the device option after fixup

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30003 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/netifd/files/lib/network/config.sh b/package/netifd/files/lib/network/config.sh
index 4ce362eb1..ab3efe8c0 100755
--- a/package/netifd/files/lib/network/config.sh
+++ b/package/netifd/files/lib/network/config.sh
@@ -26,6 +26,7 @@ fixup_interface() {
 
 	config_get type "$config" type
 	config_get ifname "$config" ifname
+	config_get device "$config" device "$ifname"
 	[ "bridge" = "$type" ] && ifname="br-$config"
 	config_set "$config" device "$ifname"
 	ubus_call "network.interface.$config" status
@@ -33,6 +34,7 @@ fixup_interface() {
 	[ -n "$l3dev" ] && ifname="$l3dev"
 	json_init
 	config_set "$config" ifname "$ifname"
+	config_set "$config" device "$device"
 }
 
 scan_interfaces() {