oxnas: add method to extract mac_adr from legacy cmdline

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/oxnas/base-files/etc/board.d/02_network b/target/linux/oxnas/base-files/etc/board.d/02_network
index a025027fea7e71900aa07384dfd24eb4b91810c7..d4010e8b3a64aef884fe762f797bcf72b8d1b23d 100755 (executable)
--- a/target/linux/oxnas/base-files/etc/board.d/02_network
+++ b/target/linux/oxnas/base-files/etc/board.d/02_network
@@ -2,10 +2,20 @@
 
 . /lib/functions/uci-defaults.sh
 . /lib/functions/system.sh
+. /lib/oxnas.sh
 
 board_config_update
 
+lan_mac=""
+
+case "$(oxnas_board_name)" in
+       kd20)
+               lan_mac="$(legacy_boot_mac_adr)"
+               ;;
+esac
+
 ucidef_set_interface_lan "eth0" "dhcp"
+[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan "$lan_mac"
 
 board_config_flush
 

diff --git a/target/linux/oxnas/base-files/lib/oxnas.sh b/target/linux/oxnas/base-files/lib/oxnas.sh
index 991f92720dd4efe235d7381ca1610307106c1ad0..b0d79ea7cf069ee9a3b350218a9e0550e06c7922 100755 (executable)
--- a/target/linux/oxnas/base-files/lib/oxnas.sh
+++ b/target/linux/oxnas/base-files/lib/oxnas.sh
@@ -6,6 +6,30 @@
 OXNAS_BOARD_NAME=
 OXNAS_MODEL=
 
+bootloader_cmdline_var() {
+       local param
+       local pval
+       for arg in $(cat /proc/device-tree/chosen/bootloader-args); do
+               param="$(echo $arg | cut -d'=' -f 1)"
+               pval="$(echo $arg | cut -d'=' -f 2-)"
+
+               if [ "$param" = "$1" ]; then
+                       echo "$pval"
+               fi
+       done
+}
+
+legacy_boot_mac_adr() {
+       local macstr
+       local oIFS
+       macstr="$(bootloader_cmdline_var mac_adr)"
+       oIFS="$IFS"
+       IFS=","
+       set -- $macstr
+       printf "%02x:%02x:%02x:%02x:%02x:%02x" $1 $2 $3 $4 $5 $6
+       IFS="$oIFS"
+}
+
 oxnas_board_detect() {
        local machine
        local name