diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-03 14:48:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-03 14:48:06 +0000 |
| commit | 6ed31e2b5cefc350d8621236110dee22482cc719 (patch) | |
| tree | b0ddb4dad4849d57335f5803e6e78166aa3ab971 | |
| parent | 8d477b34d7587d5fdce85ddbce9d5c8e4a507571 (diff) | |
| download | upstream-6ed31e2b5cefc350d8621236110dee22482cc719.tar.gz upstream-6ed31e2b5cefc350d8621236110dee22482cc719.tar.bz2 upstream-6ed31e2b5cefc350d8621236110dee22482cc719.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>
Backport of r46455
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48087 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | target/linux/ar71xx/base-files/lib/ar71xx.sh | 2 |
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 839abc711c..af92b0175c 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 |