ltq-*dsl-app: dsl_control: remove unneeded check for lantiq_dsl.sh

[openwrt/staging/hauke.git] / package / network / config / ltq-vdsl-app / files / dsl_control

diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control
index a00d2bcdbb45962a1bf09a0285b9be029355f9d0..9c5df4cccd821626c3e8c215da43c37908294a30 100644 (file)
--- a/package/network/config/ltq-vdsl-app/files/dsl_control
+++ b/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -4,11 +4,11 @@
 START=97
 USE_PROCD=1
 
-EXTRA_COMMANDS="status lucistat"
-EXTRA_HELP="   status  Get DSL status information
-       lucistat  Get status information if lua friendly format"
+EXTRA_COMMANDS="dslstat lucistat"
+EXTRA_HELP="   dslstat Get DSL status information
+       lucistat Get status information in lua friendly format"
 
-[ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh
+. /lib/functions/lantiq_dsl.sh
 
 #
 # ITU-T G.997.1 (06/2012) - Section 7.3.1.1.1 (xTU transmission system enabling (XTSE))
@@ -252,7 +252,9 @@ start_service() {
                                fi
                                ;;
                        b*|j*)
-                               if [ -f "/lib/firmware/lantiq-vrx200-b.bin" ]; then
+                               if [ -f "/lib/firmware/vr9_dsl_fw_annex_b.bin" ]; then
+                                       firmware="/lib/firmware/vr9_dsl_fw_annex_b.bin"
+                               elif [ -f "/lib/firmware/lantiq-vrx200-b.bin" ]; then
                                        firmware="/lib/firmware/lantiq-vrx200-b.bin"
                                elif [ -f "/tmp/lantiq-vrx200-b.bin" ]; then
                                        firmware="/tmp/lantiq-vrx200-b.bin"