diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-02-16 11:50:21 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-02-16 11:50:21 +0000 |
| commit | 74408f4902ba20f5b3883820b6eb645cdaa3c25e (patch) | |
| tree | de8a666b09b0e1891051d549db1a86d8d63b4589 /target/linux/ramips/base-files/lib | |
| parent | 34fe9af0472041f32d393e5e755559bd0bd4f9d8 (diff) | |
| download | upstream-74408f4902ba20f5b3883820b6eb645cdaa3c25e.tar.gz upstream-74408f4902ba20f5b3883820b6eb645cdaa3c25e.tar.bz2 upstream-74408f4902ba20f5b3883820b6eb645cdaa3c25e.zip | |
ramips: use the mtd_get_mac_* helpers
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35613 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/base-files/lib')
| -rw-r--r-- | target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 17 | ||||
| -rwxr-xr-x | target/linux/ramips/base-files/lib/ramips.sh | 37 |
2 files changed, 9 insertions, 45 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 247b5531b4..6d3dd58c06 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 @@ -5,6 +5,7 @@ preinit_set_mac_address() { local mac + . /lib/functions.sh . /lib/ramips.sh case $(ramips_board_name) in @@ -13,7 +14,7 @@ preinit_set_mac_address() { mzk-w300nh2 |\ wl-330n |\ wl-330n3g) - mac=$(ramips_get_mac_binary factory 4) + mac=$(mtd_get_mac_binary factory 4) ifconfig eth0 hw ether $mac 2>/dev/null ;; bc2 |\ @@ -25,23 +26,23 @@ preinit_set_mac_address() { psr-680w |\ rt-n56u |\ sl-r7205) - mac=$(ramips_get_mac_binary factory 4) + mac=$(mtd_get_mac_binary factory 4) mac=$(maccalc or "$mac" "02:00:00:00:00:00") ifconfig eth0 hw ether $mac 2>/dev/null ;; dir-300-b1 |\ dir-300-b2 |\ dir-600-b1) - mac=$(ramips_get_mac_binary devdata 16388) + mac=$(mtd_get_mac_binary devdata 16388) ifconfig eth0 hw ether $mac 2>/dev/null ;; dir-645) - mac=$(ramips_get_mac_nvram nvram lanmac) + mac=$(mtd_get_mac_ascii nvram lanmac) mac=$(maccalc or "$mac" "02:00:00:00:00:00") ifconfig eth0 hw ether $mac 2>/dev/null ;; dap-1350) - mac=$(ramips_get_mac_binary devdata 46) + mac=$(mtd_get_mac_binary devdata 46) ifconfig eth0 hw ether $mac 2>/dev/null ;; all0239-3g |\ @@ -61,15 +62,15 @@ preinit_set_mac_address() { w502u |\ wr6202 |\ xdxrn502j) - mac=$(ramips_get_mac_binary factory 40) + mac=$(mtd_get_mac_binary factory 40) ifconfig eth0 hw ether $mac 2>/dev/null ;; wl341v3) - mac=$(ramips_get_mac_binary board-nvram 65440) + mac=$(mtd_get_mac_binary board-nvram 65440) ifconfig eth0 hw ether $mac 2>/dev/null ;; rt-n10-plus) - mac=$(ramips_get_mac_binary devconf 4) + mac=$(mtd_get_mac_binary devconf 4) ifconfig eth0 hw ether $mac 2>/dev/null ;; esac diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index b8b735fd62..5d24abcd56 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -3,43 +3,6 @@ # 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 |