From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 5 Dec 2011 17:27:03 +0000 (+0000)
Subject: ramips: move ramips_get_mac_* functions to lib/ramips.sh
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4d5b940e6678be0f484f8bd6f75d8c96c6f7b242;p=openwrt%2Fstaging%2Fthess.git

ramips: move ramips_get_mac_* functions to lib/ramips.sh

SVN-Revision: 29451
---

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 5891b480c1..489057dfd7 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -9,39 +9,6 @@ if [ ! -x /usr/sbin/maccalc ]; then
 	return
 fi
 
-ramips_get_mac_binary()
-{
-	local mtdname="$1"
-	local seek="$2"
-	local part
-
-	part=$(find_mtd_part "$mtdname")
-	if [ -z "$part" ]; then
-		echo "ramips_get_mac_binary: partition $mtdname not found!" >&2
-		return
-	fi
-
-	dd bs=1 skip=$seek count=6 if=$part 2>/dev/null | /usr/sbin/maccalc bin2mac
-}
-
-ramips_get_mac_nvram()
-{
-	local mtdname="$1"
-	local key="$2"
-	local part
-	local mac_dirty
-
-	part=$(find_mtd_part "$mtdname")
-	if [ -z "$part" ]; then
-		echo "ramips_get_mac_nvram: partition $mtdname not found!" >&2
-		return
-	fi
-
-	mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p')
-	# "canonicalize" mac
-	maccalc add "$mac_dirty" 0
-}
-
 ramips_setup_interfaces()
 {
 	local board="$1"
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index de37e69a6c..b41a153ca9 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -3,6 +3,43 @@
 # Copyright (C) 2010 OpenWrt.org
 #
 
+ramips_get_mac_binary()
+{
+	local mtdname="$1"
+	local seek="$2"
+	local part
+
+	. /lib/functions.sh
+
+	part=$(find_mtd_part "$mtdname")
+	if [ -z "$part" ]; then
+		echo "ramips_get_mac_binary: partition $mtdname not found!" >&2
+		return
+	fi
+
+	dd bs=1 skip=$seek count=6 if=$part 2>/dev/null | /usr/sbin/maccalc bin2mac
+}
+
+ramips_get_mac_nvram()
+{
+	local mtdname="$1"
+	local key="$2"
+	local part
+	local mac_dirty
+
+	. /lib/functions.sh
+
+	part=$(find_mtd_part "$mtdname")
+	if [ -z "$part" ]; then
+		echo "ramips_get_mac_nvram: partition $mtdname not found!" >&2
+		return
+	fi
+
+	mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p')
+	# "canonicalize" mac
+	/usr/sbin/maccalc add "$mac_dirty" 0
+}
+
 ramips_board_name() {
 	local machine
 	local name