From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 15 Aug 2011 19:00:23 +0000 (+0000)
Subject: ramips: use maccalc instead of hexdump + sed
X-Git-Tag: reboot~16019
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ace8ce084517ec118b146f4732ba7382f98bc64f;p=oweals%2Fopenwrt.git

ramips: use maccalc instead of hexdump + sed

SVN-Revision: 28007
---

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/nw718 b/target/linux/ramips/base-files/etc/uci-defaults/nw718
index 4ce3bc9af8..590b65913e 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/nw718
+++ b/target/linux/ramips/base-files/etc/uci-defaults/nw718
@@ -8,15 +8,16 @@ nw718_set_macs() {
 	local lan_mac
 	local wan_mac
 
+	[ -z $(which maccalc) ] && return
+
 	. /etc/functions.sh
 
 	part=$(find_mtd_part "factory")
 	[ -z $part ] && return
 
-	lan_mac=$(dd bs=1 skip=4 count=6 if=$part 2>/dev/null | hexdump -v -e '1/1 "%02x"' | sed 's/\(..\)/\1:/g;s/:$//')
+	lan_mac=$(dd bs=1 skip=4 count=6 if=$part 2>/dev/null | maccalc bin2mac)
 	[ -z $lan_mac ] && return
 
-	[ -z $(which maccalc) ] && return
 	wan_mac=$(maccalc add $lan_mac 1)
 
 	uci batch <<EOF