relayd: remove old start-stop-service related code

[openwrt/staging/yousong.git] / package / network / services / relayd / files / relay.init

diff --git a/package/network/services/relayd/files/relay.init b/package/network/services/relayd/files/relay.init
index edc419c0b9b4a062055f18b9267890236df5d88f..ac10f48b70acaed3213d2f207a3bdea7f7575a06 100644 (file)
--- a/package/network/services/relayd/files/relay.init
+++ b/package/network/services/relayd/files/relay.init
@@ -1,14 +1,26 @@
 #!/bin/sh /etc/rc.common
 # Copyright (c) 2011-2012 OpenWrt.org
+
 START=80
 
 USE_PROCD=1
 PROG=/usr/sbin/relayd
 
+validate_proto_relayd()
+{
+       uci_validate_section network "interface" "${1}" \
+               'network:list(string)' \
+               'expiry:uinteger:30' \
+               'retry:uinteger:5' \
+               'table:range(0, 65535):16800' \
+               'forward_bcast:bool:1' \
+               'forward_dhcp:bool:1'
+}
+
 resolve_ifname() {
        grep -qs "^ *$1:" /proc/net/dev && {
                procd_append_param command -I "$1"
-               append ifaces "$1"
+               procd_append_param netdev "$1"
        }
 }
 
@@ -23,25 +35,14 @@ resolve_network() {
 start_relay() {
        local cfg="$1"
 
-       local args=""
-       local ifaces=""
-
        config_get proto "$cfg" proto
-       [[ "$proto" == relay ]] || return 0
-
-       SERVICE_DAEMONIZE=1
-       SERVICE_WRITE_PID=1
-       SERVICE_PID_FILE="/var/run/relay-$cfg.pid"
-       [ -f "$SERVICE_PID_FILE" ] && {
-               if grep -q relayd "/proc/$(cat $SERVICE_PID_FILE)/cmdline"; then
-                       return 0
-               else
-                       rm -f "$SERVICE_PID_FILE"
-               fi
-       }
+       [ "$proto" = "relay" ] || return 0
+
+       config_get_bool disabled "$cfg" disabled 0
+       [ "$disabled" -gt 0 ] && return 0
 
-        procd_open_instance
-        procd_set_param command "$PROG"
+       procd_open_instance
+       procd_set_param command "$PROG"
 
        local net networks
        config_get networks "$cfg" network
@@ -67,7 +68,7 @@ start_relay() {
 
        local expiry # = 30
        config_get expiry "$cfg" expiry
-       [ -n "$expiry" ] && procd_append_param command "$expiry"
+       [ -n "$expiry" ] && procd_append_param command -t "$expiry"
 
        local retry # = 5
        config_get retry "$cfg" retry
@@ -83,7 +84,7 @@ start_relay() {
 
        local fwd_dhcp # = 1
        config_get_bool fwd_dhcp "$cfg" forward_dhcp 1
-       [ $fwd_dhcp -eq 1 ] && procd_append_param command"-D"
+       [ $fwd_dhcp -eq 1 ] && procd_append_param command "-D"
 
        procd_close_instance
 }
@@ -91,6 +92,7 @@ start_relay() {
 service_triggers()
 {
        procd_add_reload_trigger "network"
+       procd_add_raw_trigger "interface.*" 2000 /etc/init.d/relayd reload
 }
 
 start_service() {