KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: fix wndr3700_board_detect for some NETGEAR WNDR3700v2

Browse source 
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
This commit is contained in:
John Crispin 2015-07-24 09:09:27 +00:00
parent dcae3723fd
commit 85c7f3fb29
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ar71xx/base-files/lib/ar71xx.sh
View file

@ -38,7 +38,7 @@ wndr3700_board_detect() {
;; ;;
"33373031") "33373031")
# Use awk to remove everything after the first zero byte # 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 case $model in
$'\xff'*) $'\xff'*)
if [ "${model:24:1}" = 'N' ]; then if [ "${model:24:1}" = 'N' ]; then