From: John Crispin <john@openwrt.org>
Date: Thu, 30 Oct 2014 08:08:01 +0000 (+0000)
Subject: ltq-vdsl-app: use VDSL tone-setup if annex is unset
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=26e308019dd45eac4826db900d6ffd24df4c1e50;p=openwrt%2Fstaging%2Fyousong.git

ltq-vdsl-app: use VDSL tone-setup if annex is unset

I had to use a VDSL-only tone-setup to get show-time.
Handle this in uci by checking if annex is unset.

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

SVN-Revision: 43114
---

diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control
index 4bfea97031..bededb2612 100644
--- a/package/network/config/ltq-vdsl-app/files/dsl_control
+++ b/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -131,6 +131,7 @@ start() {
 	local tone
 	local tone_adsl
 	local tone_vdsl
+	local xtse
 	local xtse_adsl
 	local mode
 
@@ -154,7 +155,12 @@ start() {
 	esac
 
 	eval "xtse_adsl=\"\${xtse_adsl_$annex}\""
-	[ -z "${xtse_adsl}" ] && xtse_adsl=$xtse_adsl_a
+	if [ "${xtse_adsl}" ]; then
+		xtse=$xtse_adsl
+	else
+		xtse_adsl=$xtse_adsl_a
+		xtse=$xtse_vdsl
+	fi
 
 	eval "tone_adsl=\"\${tone_adsl_$tone}\""
 	[ -z "${tone_adsl}" ] && tone_adsl=$tone_adsl_av
@@ -173,7 +179,7 @@ start() {
 	lowlevel_cfg "${tone_adsl}" "${tone_vdsl}"
 
 	service_start /sbin/vdsl_cpe_control \
-			-i `echo $xtse_adsl | sed "s/ /_/g"` \
+			-i `echo $xtse | sed "s/ /_/g"` \
 			-n /sbin/dsl_notify.sh \
 			-f ${firmware} \
 			-a /tmp/adsl.scr \