aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/files/bin/config_generate5
-rw-r--r--package/base-files/files/lib/functions/system.sh35
2 files changed, 32 insertions, 8 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 0b26afe57f..3ca035ca8b 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -260,11 +260,6 @@ generate_static_system() {
uci -q set "system.@system[-1].hostname=$hostname"
fi
- local label_macaddr
- if json_get_var label_macaddr label_macaddr; then
- uci -q set "system.@system[-1].label_macaddr=$label_macaddr"
- fi
-
if json_is_a ntpserver array; then
local keys key
json_get_keys keys ntpserver
diff --git a/package/base-files/files/lib/functions/system.sh b/package/base-files/files/lib/functions/system.sh
index cb0508fe9c..be7efe4e2e 100644
--- a/package/base-files/files/lib/functions/system.sh
+++ b/package/base-files/files/lib/functions/system.sh
@@ -1,5 +1,7 @@
# Copyright (C) 2006-2013 OpenWrt.org
+. /usr/share/libubox/jshn.sh
+
get_mac_binary() {
local path="$1"
local offset="$2"
@@ -12,14 +14,41 @@ get_mac_binary() {
hexdump -v -n 6 -s $offset -e '5/1 "%02x:" 1/1 "%02x"' $path 2>/dev/null
}
-get_mac_label() {
+get_mac_label_dt() {
local basepath="/proc/device-tree"
local macdevice="$(cat "$basepath/aliases/label-mac-device" 2>/dev/null)"
local macaddr
- [ -n "$macdevice" ] && macaddr=$(get_mac_binary "$basepath/$macdevice/mac-address" 0 2>/dev/null)
+ [ -n "$macdevice" ] || return
+
+ macaddr=$(get_mac_binary "$basepath/$macdevice/mac-address" 0 2>/dev/null)
[ -n "$macaddr" ] || macaddr=$(get_mac_binary "$basepath/$macdevice/local-mac-address" 0 2>/dev/null)
- [ -n "$macaddr" ] || macaddr=$(uci -q get system.@system[0].label_macaddr)
+
+ echo $macaddr
+}
+
+get_mac_label_json() {
+ local cfg="/etc/board.json"
+ local macaddr
+
+ [ -s "$cfg" ] || return
+
+ json_init
+ json_load "$(cat $cfg)"
+ if json_is_a system object; then
+ json_select system
+ json_get_var macaddr label_macaddr
+ json_select ..
+ fi
+
+ echo $macaddr
+}
+
+get_mac_label() {
+ local macaddr=$(get_mac_label_dt)
+
+ [ -n "$macaddr" ] || macaddr=$(get_mac_label_json)
+
echo $macaddr
}