aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael 'ASAP' Weinrich <michael@a5ap.net>2023-10-05 19:39:58 -0700
committerChristian Marangi <ansuelsmth@gmail.com>2023-10-20 13:09:47 +0200
commit0da199f60c47a4b861562ffec3842535eb56a67b (patch)
tree8602ef2cc8368d2cc616e3ddfbda1ab31d8887ae
parentc0c4a9bce42bea74fa9fa984cde149eac5e479bf (diff)
downloadupstream-0da199f60c47a4b861562ffec3842535eb56a67b.tar.gz
upstream-0da199f60c47a4b861562ffec3842535eb56a67b.tar.bz2
upstream-0da199f60c47a4b861562ffec3842535eb56a67b.zip
base-files: fix wrong ucidef_set_network_device_mac network-device entry
The ucidef_set_network_device_* functions in uci-defaults.sh disagree on whether to use "network-device" or "network_device" in board.json. With the additional caveat that jshn will translate hyphens (-) into underscores (_). This casues problems in netifd which expected "network_device" causing boards which depend on assigning MACs in board.json via uci-defaults.sh (or jshn in general) to fail. This commit addresses the issue by using network_device in uci-defaults.sh. The bug was uncovered in the forums here: https://forum.openwrt.org/t/support-for-rtl838x-based-managed-switches/57875/2596 This was exposed by commit 4ebba8a05d09 ("realtek: add support for HPE 1920-8g-poe+") where the board_config_load call from 03_gpio introduced the key normalization by jshn. Fixes: 9290539ca9c7 ("base-files: allow setting device and bridge macs") Tested-by: Stijn Segers <foss@volatilesystems.org> Signed-off-by: Michael 'ASAP' Weinrich <michael@a5ap.net> [ improve commit title, description and fix wrong Tested-by tag ] Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> (cherry picked from commit 12bc79d6d521581e37a8b067ce8a562429aeefbd)
-rw-r--r--package/base-files/files/lib/functions/uci-defaults.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index a37e8cf824..6f395ec24b 100644
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -107,7 +107,7 @@ ucidef_set_bridge_mac() {
}
ucidef_set_network_device_mac() {
- json_select_object "network-device"
+ json_select_object "network_device"
json_select_object "${1}"
json_add_string macaddr "${2}"
json_select ..