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

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

diff --git a/package/network/config/ltq-adsl-app/files/dsl_control b/package/network/config/ltq-adsl-app/files/dsl_control
index dcde6b233820a84c859b0bbb7f76d1cc397d5f25..44f5fb869015419e033883ca421d648bd310ca64 100644 (file)
--- a/package/network/config/ltq-adsl-app/files/dsl_control
+++ b/package/network/config/ltq-adsl-app/files/dsl_control
@@ -1,16 +1,14 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2012 OpenWrt.org
 
-START=49
+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"
 
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
-[ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh
+. /lib/functions/lantiq_dsl.sh
 
 annex_b=10_00_10_00_00_04_00_00
 annex_bdmt=10_00_00_00_00_00_00_00
@@ -28,7 +26,11 @@ annex_m2=00_00_00_00_40_00_00_00
 annex_m2p=00_00_00_00_00_00_04_00
 annex_j=10_00_10_40_00_04_01_00
 
-start() {
+service_triggers() {
+       procd_add_reload_trigger network
+}
+
+start_service() {
        local annex
        local firmware
        local xtu
@@ -45,14 +47,15 @@ start() {
                return 1
        }
 
-       esi $(printf '%012X' $((1+0x$(tr -d : </sys/class/net/eth0/address))))
-
-       service_start /sbin/dsl_cpe_control -i${xtu} \
+       procd_open_instance
+       procd_set_param command /sbin/dsl_cpe_control \
+                       -i${xtu} \
                        -n /sbin/dsl_notify.sh \
                        -f ${firmware}
+       procd_close_instance
 }
 
-stop() {
+stop_service() {
        DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
        DSL_INTERFACE_STATUS="DOWN" \
                /sbin/dsl_notify.sh