Author: nbd Date: 2016-01-03 15:48:17 +0100 (Sun, 03 Jan 2016) New Revision: 48089
Modified: branches/chaos_calmer/target/linux/ar71xx/base-files/lib/ar71xx.sh Log: ar71xx: another fix to wndr3700_board_detect My last bugfix (r47538) introduced a new bug in wndr3700_board_detect (again...). Assigning the result of ar71xx_get_mtd_offset_size_format to the model variable before stripping of garbage using awk will cause all NUL bytes to be removed before awk is applied, leading to model strings like "NETGEAR WNDRMACv2NETGEAR", where a NUL byte after the v2 is supposed to terminate the string. Fix by calling ar71xx_get_mtd_offset_size_format twice, once piping to awk directly. Signed-off-by: Matthias Schiffer <[email protected]> Backport of r48075 Modified: branches/chaos_calmer/target/linux/ar71xx/base-files/lib/ar71xx.sh =================================================================== --- branches/chaos_calmer/target/linux/ar71xx/base-files/lib/ar71xx.sh 2016-01-03 14:48:13 UTC (rev 48088) +++ branches/chaos_calmer/target/linux/ar71xx/base-files/lib/ar71xx.sh 2016-01-03 14:48:17 UTC (rev 48089) @@ -39,7 +39,7 @@ "33373031") model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c)" # Use awk to remove everything unprintable - model_stripped="$(echo -n "$model" | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')" + model_stripped="$(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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
