diff options
| -rw-r--r-- | package/ltq-dsl-app/files/dsl_control | 25 | ||||
| -rw-r--r-- | package/ltq-dsl/Makefile | 2 |
2 files changed, 11 insertions, 16 deletions
diff --git a/package/ltq-dsl-app/files/dsl_control b/package/ltq-dsl-app/files/dsl_control index 02e89a0fd7..e8a286f2bb 100644 --- a/package/ltq-dsl-app/files/dsl_control +++ b/package/ltq-dsl-app/files/dsl_control @@ -1,8 +1,7 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2008 OpenWrt.org -START=99 +# Copyright (C) 2012 OpenWrt.org -. /lib/functions.sh +START=99 EXTRA_COMMANDS="status lucistat" EXTRA_HELP=" status Get DSL status information @@ -278,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/dsl-fw-${fwannex}.bin + -f /lib/firmware/${firmware} } # @@ -309,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 } diff --git a/package/ltq-dsl/Makefile b/package/ltq-dsl/Makefile index 0e2a9328a8..430a073f39 100644 --- a/package/ltq-dsl/Makefile +++ b/package/ltq-dsl/Makefile @@ -161,7 +161,7 @@ endef define Package/kmod-ltq-dsl-firmware-$(BUILD_VARIANT)/install $(INSTALL_DIR) $(1)/lib/firmware/ $(CP) $(PKG_BUILD_DIR)/$(FW_NAME)/ltq-dsl-fw-$(BUILD_VARIANT).bin $(1)/lib/firmware/dsl-fw-$(word 1, $(subst -, ,$(BUILD_VARIANT))).bin - ln -s /lib/firmware/dsl-fw-$(word 1, $(subst -, ,$(BUILD_VARIANT))).bin $(1)/lib/firmware/ModemHWE.bin + ln -s /lib/firmware/dsl-fw-$(word 1, $(subst -, ,$(BUILD_VARIANT))).bin $(1)/lib/firmware/adsl.bin endef $(eval $(call BuildPackage,kmod-ltq-dsl-firmware-a-danube)) |