diff options
| author | John Crispin <blogic@openwrt.org> | 2014-10-30 08:08:01 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-10-30 08:08:01 +0000 |
| commit | a1a0c5c0c11ad797fea45974dfbbbc46419b25ba (patch) | |
| tree | 1e09a3eed48887512c694446d98810985929e7f6 /package/network/config | |
| parent | 5152943391a61880989a2b0d8e81b61f713dc0e8 (diff) | |
| download | upstream-a1a0c5c0c11ad797fea45974dfbbbc46419b25ba.tar.gz upstream-a1a0c5c0c11ad797fea45974dfbbbc46419b25ba.tar.bz2 upstream-a1a0c5c0c11ad797fea45974dfbbbc46419b25ba.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43114 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/config')
| -rw-r--r-- | package/network/config/ltq-vdsl-app/files/dsl_control | 10 |
1 files changed, 8 insertions, 2 deletions
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 \ |