aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-07-24 09:09:27 +0000
committerJohn Crispin <john@openwrt.org>2015-07-24 09:09:27 +0000
commit85c7f3fb29e80997ae186aacec081cd181bbdf4b (patch)
treef73023c4b4791676865e0d1a6e3c8ffd48534919
parentdcae3723fdde4ef48ee1336abfbd2d57a2b8cc85 (diff)
downloadupstream-85c7f3fb29e80997ae186aacec081cd181bbdf4b.tar.gz
upstream-85c7f3fb29e80997ae186aacec081cd181bbdf4b.tar.bz2
upstream-85c7f3fb29e80997ae186aacec081cd181bbdf4b.zip
ar71xx: fix wndr3700_board_detect for some NETGEAR WNDR3700v2
There are a few NETGEAR devices which don't terminate the model name in the ART with a NUL byte, at least some NETGEAR WNDR3700v2. The current awk expression doesn't match 0xFF bytes, so AR71XX_MODEL contains lots of trailing 0xFF garbage in this case. Fix this by matching for the first non-printable character and explicitly setting LC_CTYPE=C (probably not strictly necessary on OpenWrt, but will definitely work like this, even when awk supports locales and LANG is set). Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> SVN-Revision: 46455
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/ar71xx.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 9edd0cdf98..e1c47eeaf7 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -38,7 +38,7 @@ wndr3700_board_detect() {
;;
"33373031")
# Use awk to remove everything after the first zero byte
- model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | awk 'BEGIN{FS="[[:cntrl:]]"} {print $1; exit}')"
+ model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
case $model in
$'\xff'*)
if [ "${model:24:1}" = 'N' ]; then