From d7a5a32c176da711e4b454c3b87228d9223eb6d4 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 5 Dec 2011 17:27:04 +0000
Subject: [PATCH] ramips: use ramips_get_mac_* functions in the preinit script
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29452 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
.../base-files/lib/preinit/06_set_iface_mac | 22 ++++---------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
index 290e27053..9fef7d471 100644
--- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
+++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
@@ -2,30 +2,16 @@
# Copyright (C) 2011 OpenWrt.org
#
-nw718_set_mac() {
- local part
+preinit_set_mac_address() {
local mac
- [ -z $(which maccalc) ] && return
-
- . /etc/functions.sh
-
- part=$(find_mtd_part "factory")
- [ -z $part ] && return
-
- mac=$(dd bs=1 skip=4 count=6 if=$part 2>/dev/null | maccalc bin2mac)
- [ -z $mac ] && return
-
- mac=$(maccalc or "$mac" "02:00:00:00:00:00")
- ifconfig eth0 hw ether $mac 2>/dev/null
-}
-
-preinit_set_mac_address() {
. /lib/ramips.sh
case $(ramips_board_name) in
bc2 | nw718)
- nw718_set_mac
+ mac=$(ramips_get_mac_binary factory 4)
+ mac=$(maccalc or "$mac" "02:00:00:00:00:00")
+ ifconfig eth0 hw ether $mac 2>/dev/null
;;
esac
}
--
2.20.1