aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2016-04-01 07:11:56 +0000
committerJohn Crispin <john@openwrt.org>2016-04-01 07:11:56 +0000
commit85c540b94e727b6c30b85b5dfe18d7e98673bfc4 (patch)
tree15149b7983e4a7c9a7b7db550768c1c2e7ed264d
parentdfed41d3d805e9383ff4c9dd184a0e5d4046e617 (diff)
downloadupstream-85c540b94e727b6c30b85b5dfe18d7e98673bfc4.tar.gz
upstream-85c540b94e727b6c30b85b5dfe18d7e98673bfc4.tar.bz2
upstream-85c540b94e727b6c30b85b5dfe18d7e98673bfc4.zip
ar71xx: avoid AR71XX_MODEL ending with a space on some TP-LINK-like devices
Instead of adding the space when combining $model and $hwver, add the space to the beginning of $hwver, so the resulting string won't end with a space when $hwver is set to the empty string. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> SVN-Revision: 49106
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/ar71xx.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 0d1405a254..182299802b 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -99,7 +99,7 @@ tplink_board_detect() {
hwid=$(tplink_get_hwid)
mid=$(tplink_get_mid)
hwver=${hwid:6:2}
- hwver="v${hwver#0}"
+ hwver=" v${hwver#0}"
case "$hwid" in
"015000"*)
@@ -171,8 +171,8 @@ tplink_board_detect() {
"083000"*)
model="TP-Link TL-WA830RE"
- if [ "$hwver" = 'v10' ]; then
- hwver='v1'
+ if [ "$hwver" = ' v10' ]; then
+ hwver=' v1'
fi
;;
"084100"*)
@@ -277,7 +277,7 @@ tplink_board_detect() {
;;
esac
- AR71XX_MODEL="$model $hwver"
+ AR71XX_MODEL="$model$hwver"
}
tplink_pharos_get_model_string() {