From: Christian Marangi Date: Tue, 20 Jun 2023 07:57:07 +0000 (+0200) Subject: ipq806x: move ASRock G10 fix mac preinit script to generic board.d script X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=f166c9e6177123d8ef67150bb6376c217a261414 ipq806x: move ASRock G10 fix mac preinit script to generic board.d script Drop and move ASRock G10 preinit script to fix mac address to generic board.d script and rework for consistency with other devices following a similar implementation. Signed-off-by: Christian Marangi --- diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network index d64805b8f5..3ba3ff79e9 100644 --- a/target/linux/ipq806x/base-files/etc/board.d/02_network +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network @@ -83,6 +83,12 @@ ipq806x_setup_macs() ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 2)" ucidef_set_interface_macaddr "wan" "$(macaddr_add $hw_mac_addr 3)" ;; + asrock,g10) + hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.LAN.MAC.Address) + ucidef_set_interface_macaddr "lan" "$hw_mac_addr" + hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.WAN.MAC.Address) + ucidef_set_interface_macaddr "wan" "$hw_mac_addr" + ;; esac } diff --git a/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh b/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh deleted file mode 100644 index ca8d0b1555..0000000000 --- a/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh +++ /dev/null @@ -1,14 +0,0 @@ -. /lib/functions.sh - -preinit_set_mac_address() { - case $(board_name) in - asrock,g10) - lan_mac=$(mtd_get_mac_ascii hwconfig HW.LAN.MAC.Address) - wan_mac=$(mtd_get_mac_ascii hwconfig HW.WAN.MAC.Address) - ip link set dev eth0 address "${lan_mac}" - ip link set dev eth1 address "${wan_mac}" - ;; - esac -} - -boot_hook_add preinit_main preinit_set_mac_address