diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2011-12-05 17:27:03 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2011-12-05 17:27:03 +0000 |
| commit | 4d5b940e6678be0f484f8bd6f75d8c96c6f7b242 (patch) | |
| tree | dc9c2fa7e7b87f86b586e0d925662d7f5ee8d40c | |
| parent | cc853acb3a6a840b695407b143ab80c260521d88 (diff) | |
| download | upstream-4d5b940e6678be0f484f8bd6f75d8c96c6f7b242.tar.gz upstream-4d5b940e6678be0f484f8bd6f75d8c96c6f7b242.tar.bz2 upstream-4d5b940e6678be0f484f8bd6f75d8c96c6f7b242.zip | |
ramips: move ramips_get_mac_* functions to lib/ramips.sh
SVN-Revision: 29451
| -rwxr-xr-x | target/linux/ramips/base-files/etc/uci-defaults/network | 33 | ||||
| -rwxr-xr-x | target/linux/ramips/base-files/lib/ramips.sh | 37 |
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 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 |