mac80211: update to wireless-testing 2012-02-06

[openwrt.git] / package / relayd / files / relay.sh

diff --git a/package/relayd/files/relay.sh b/package/relayd/files/relay.sh
index 3e5e84c..9cfdbbb 100644 (file)
--- a/package/relayd/files/relay.sh
+++ b/package/relayd/files/relay.sh
@@ -48,6 +48,10 @@ setup_interface_relay() {
                resolve_ifname "$ifn"
        done
 
+       local ipaddr
+       config_get ipaddr "$cfg" ipaddr
+       [ -n "$ipaddr" ] && append args "-L $ipaddr"
+
        local gateway
        config_get gateway "$cfg" gateway
        [ -n "$gateway" ] && append args "-G $gateway"
@@ -72,8 +76,10 @@ setup_interface_relay() {
        config_get_bool fwd_dhcp "$cfg" forward_dhcp 1
        [ $fwd_dhcp -eq 1 ] && append args "-D"
 
-       start-stop-daemon -b -S -m -p /var/run/$link.pid \
-               -x /usr/sbin/relayd -- $args
+       SERVICE_DAEMONIZE=1 \
+       SERVICE_WRITE_PID=1 \
+       SERVICE_PID_FILE="/var/run/$link.pid" \
+       service_start /usr/sbin/relayd $args
 
        uci_set_state network "$cfg" device "$ifaces"
 
@@ -88,6 +94,7 @@ stop_interface_relay() {
        env -i ACTION="ifdown" DEVICE="$link" INTERFACE="$cfg" PROTO="relay" \
                /sbin/hotplug-call iface
 
-       service_kill relayd "/var/run/$link.pid"
+       SERVICE_PID_FILE="/var/run/$link.pid" \
+       service_stop /usr/sbin/relayd
 }