aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-12-05 17:27:04 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-12-05 17:27:04 +0000
commit953b52d3064d2fe439c0ee0e2fb90169822620f7 (patch)
treeb4974f92d6f5325e22d9383c2b235c934ccb3d90
parentdcaa1e228cf49a2d27d88f133e3fbc7168646cf5 (diff)
downloadupstream-953b52d3064d2fe439c0ee0e2fb90169822620f7.tar.gz
upstream-953b52d3064d2fe439c0ee0e2fb90169822620f7.tar.bz2
upstream-953b52d3064d2fe439c0ee0e2fb90169822620f7.zip
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
-rw-r--r--target/linux/ramips/base-files/lib/preinit/06_set_iface_mac22
1 files 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 290e270530..9fef7d471a 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
}