summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-05 17:27:03 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-05 17:27:03 +0000
commite595553be8d9cd4a9e1346a7bb36c152bb8d5673 (patch)
tree80452c4bca2049cf52219752a46ee25613b06962
parent5db41b5518f6e1ca133bc938bf46cd02882d9337 (diff)
ramips: move ramips_get_mac_* functions to lib/ramips.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29451 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xtarget/linux/ramips/base-files/etc/uci-defaults/network33
-rwxr-xr-xtarget/linux/ramips/base-files/lib/ramips.sh37
2 files changed, 37 insertions, 33 deletions
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 5891b480c..489057dfd 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 de37e69a6..b41a153ca 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