diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-11-08 12:16:21 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-11-08 12:16:21 +0000 |
| commit | 23cf4263246d4304323c3f732445a8f478976bac (patch) | |
| tree | 7c6cc11bda37340679066abd6c0789f5f4101492 /package/base-files | |
| parent | 7bd3a7bc7b21a98a6ba3198a3ecb94a6a16716f6 (diff) | |
| download | mtk-20170518-23cf4263246d4304323c3f732445a8f478976bac.zip mtk-20170518-23cf4263246d4304323c3f732445a8f478976bac.tar.gz mtk-20170518-23cf4263246d4304323c3f732445a8f478976bac.tar.bz2 | |
base-files: mtd_get_mac_ascii bugfix
The mtd_get_mac_ascii utility function was broken. This fixes it.
- Remove the superfluous include of /lib/functions.sh. The
function is already in that file so it is pointless,
- only use a variable if the whole key word matches,
- don't try to process the MAC address if it is empty,
- use 'tr' to canonicalize the MAC address,
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
[juhosg: add more fixes, update commit message]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38690
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/lib/functions.sh | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 3ba30c3..f0b2e37 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=146 +PKG_RELEASE:=147 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=opkg/host diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 19cfbae..6cb6df9 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -248,17 +248,16 @@ mtd_get_mac_ascii() local part local mac_dirty - . /lib/functions.sh - part=$(find_mtd_part "$mtdname") if [ -z "$part" ]; then echo "mtd_get_mac_ascii: partition $mtdname not found!" >&2 return fi - mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p') + mac_dirty=$(strings "$part" | sed -n 's/^'"$key"'=//p') + # "canonicalize" mac - printf "%02x:%02x:%02x:%02x:%02x:%02x" 0x${mac_dirty//:/ 0x} + [ -n "$mac_dirty" ] && echo ${mac_dirty} | tr [A-F] [a-f] } mtd_get_mac_binary() { |