Home Explore Help
Register Sign In
FreifunkHochstift
/
gluon
6
0
Fork 0
Files Issues 0 Pull Requests 0
Tree: 66f6ff2385
Branches Tags
gluon
/
patches
/
openwrt
/
0027-ar71xx-fix-model-string-detection-on-NETGEAR-WNDR3700-3800-WNDRMAC.patch

0027-ar71xx-fix-model-string-detection-on-NETGEAR-WNDR3700-3800-WNDRMAC.patch 2.2 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465 
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
    2. 

  2. Date: Sun, 29 Mar 2015 13:23:26 +0200
    3. 

  3. Subject: ar71xx: fix model string detection on NETGEAR WNDR3700/3800/WNDRMAC
    4. 

  4. 

  5. There were a few issues with the existing code to detect the model string:
    6. 

  6. * Always using the string starting with byte 56 would cut off the W of WNDR when
    7. 

  7.   the ID starts with 29763654+16+64 instead of 29763654+16+128
    8. 

  8. * The string contained garbage after the zero byte instead of cutting it off
    9. 

  9.   after the zero (which wasn't always visible using busybox tools, but could
    10. 

  10.   confuse other scripts)
    11. 

  11. 

  12. Tested on a WNDR3700v1 and a WNDR3700v2 using the new 29763654+16+64 ID in the
    13. 

  13. ART. Furthermore, tested against ART dumps of a WNDR3700v2 using the old
    14. 

  14. $'\xff...' value and a WNDR3800.
    15. 

  15. 

  16. The [ -z "$model" ] check was dropped as there is no way to actually hit this
    17. 

  17. unless no ART partition is found at all.
    18. 

  18. 

  19. The awk command was carefully crafted to work both with gawk and the (horribly
    20. 

  20. broken) busybox awk.
    21. 

  21. 

  22. Fixes #18992.
    23. 

  23. 

  24. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
    25. 

  25. 

  26. diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
    27. 

  27. index a698ce5..1838cb4 100755
    28. 

  28. --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
    29. 

  29. +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
    30. 

  30. @@ -37,16 +37,26 @@ wndr3700_board_detect() {
    31. 

  31.  		machine="NETGEAR WNDR3700"
    32. 

  32.  		;;
    33. 

  33.  	"33373031")
    34. 

  34. -		local model
    35. 

  35. -		model=$(ar71xx_get_mtd_offset_size_format art 56 10 %c)
    36. 

  36. -		if [ -z "$model" ] || [ "$model" = $'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff' ]; then
    37. 

  37. -			machine="NETGEAR WNDR3700v2"
    38. 

  38. -		elif [ -z "$model" ] || [ "$model" = $'\xff\xff\xff\xff\xff\xff\xff\xff\xffN' ]; then
    39. 

  39. -			machine="NETGEAR WNDRMAC"
    40. 

  40. -		else
    41. 

  41. +		# Use awk to remove everything after the first zero byte
    42. 

  42. +		model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | awk 'BEGIN{FS="[[:cntrl:]]"} {print $1; exit}')"
    43. 

  43. +		case $model in
    44. 

  44. +		$'\xff'*)
    45. 

  45. +			if [ "${model:24:1}" = 'N' ]; then
    46. 

  46. +				machine="NETGEAR WNDRMAC"
    47. 

  47. +			else
    48. 

  48. +				machine="NETGEAR WNDR3700v2"
    49. 

  49. +			fi
    50. 

  50. +			;;
    51. 

  51. +		'29763654+16+64'*)
    52. 

  52. +			machine="NETGEAR ${model:14}"
    53. 

  53. +			;;
    54. 

  54. +		'29763654+16+128'*)
    55. 

  55. +			machine="NETGEAR ${model:15}"
    56. 

  56. +			;;
    57. 

  57. +		*)
    58. 

  58. +			# Unknown ID
    59. 

  59.  			machine="NETGEAR $model"
    60. 

  60. -		fi
    61. 

  61. -		;;
    62. 

  62. +		esac
    63. 

  63.  	esac
    64. 

  64.  
    65. 

  65.  	AR71XX_BOARD_NAME="$name"
    66.