aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2012-12-21 13:47:25 +0000
committerJohn Crispin <john@openwrt.org>2012-12-21 13:47:25 +0000
commit9a134fb7c0ccaf77a0f6851d7496494a4cfa4fab (patch)
tree5e820526d8dc89bddc0dff9916888f0f481c4cef
parent346a8e5878b08e77bdf8430ec5f96a30b7ac108b (diff)
downloadupstream-9a134fb7c0ccaf77a0f6851d7496494a4cfa4fab.tar.gz
upstream-9a134fb7c0ccaf77a0f6851d7496494a4cfa4fab.tar.bz2
upstream-9a134fb7c0ccaf77a0f6851d7496494a4cfa4fab.zip
minor cleanup for adsl firmware handling
SVN-Revision: 34818
-rw-r--r--package/platform/lantiq/ltq-adsl-app/files/dsl_control20
1 files changed, 8 insertions, 12 deletions
diff --git a/package/platform/lantiq/ltq-adsl-app/files/dsl_control b/package/platform/lantiq/ltq-adsl-app/files/dsl_control
index c3c712db8a..e8a286f2bb 100644
--- a/package/platform/lantiq/ltq-adsl-app/files/dsl_control
+++ b/package/platform/lantiq/ltq-adsl-app/files/dsl_control
@@ -277,27 +277,23 @@ annex_m2p=00_00_00_00_00_00_04_00
#
start() {
local annex
- local fwannex
+ local firmware
local xtu
config_load network
- config_get annex adsl annex
- config_get fwannex adsl fwannex
+ config_get annex wan annex
+ config_get firmware wan firmware
# get xtu
eval "xtu=\"\${annex_$annex}\""
- # check for invalid annex mode
- [ -n "${annex}" -a -z "${xtu}" ] &&
- echo "unknown annex mode $annex"
-
- # check for invalid fw annex mode
- [[ "$fwannex" != "a" && "$fwannex" != "b" ]] &&
- echo "invalid fwannex: $fwannex"
+ # check for firmware
+ [ -z "${firmware}" ] &&
+ firmware=adsl.bin
# start CPE dsl daemon in the background
service_start /sbin/dsl_cpe_control -i${xtu} \
-n /sbin/dsl_notify.sh \
- -f /lib/firmware/ModemHWE.bin
+ -f /lib/firmware/${firmware}
}
#
@@ -308,7 +304,7 @@ start() {
stop() {
DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
DSL_INTERFACE_STATUS="DOWN" \
- /sbin/dsl_notify.sh
+ /sbin/dsl_notify.sh
service_stop /sbin/dsl_cpe_control
}