From b5d7b359b2b9377f2817bcac56ec6843cb9c7ccd Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 5 Dec 2011 17:27:04 +0000 Subject: [PATCH] ramips: use ramips_get_mac_* functions in the preinit script SVN-Revision: 29452 --- .../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 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 }