From: John Crispin <john@openwrt.org>
Date: Wed, 29 Oct 2014 08:23:47 +0000 (+0000)
Subject: lantiq_dsl.sh: properly detect vdsl_cpe_control and add missing quotes
X-Git-Tag: reboot~5488
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9762c549149e1226a3affe43df71aa14379bd5d5;p=oweals%2Fopenwrt.git

lantiq_dsl.sh: properly detect vdsl_cpe_control and add missing quotes

lantiq_dsl.sh didn't work with VDSL chipsets for now, fix that by
detecting whether vdsl_cpe_control or dsl_cpe_control should be used.
Also add missing quotes around shell string comparision.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43101
---

diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh
index e817fdd6b4..56b8652588 100644
--- a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh
+++ b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh
@@ -1,7 +1,11 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2014 OpenWrt.org
 
-XDSL_CTRL=dsl_cpe_control
+if [ "$( which vdsl_cpe_control )" ]; then
+	XDSL_CTRL=vdsl_cpe_control
+else
+	XDSL_CTRL=dsl_cpe_control
+fi
 
 #
 # Basic functions to send CLI commands to the vdsl_cpe_control daemon
@@ -212,7 +216,7 @@ line_state() {
 		*)		s="unknown" ;;
 	esac
 
-	if [ $action = "lucistat" ]; then
+	if [ "$action" = "lucistat" ]; then
 		echo "dsl.line_state_num=$ls"
 		echo "dsl.line_state_detail=\"$s\""
 		if [ "$ls" = "0x801" ]; then