diff options
| author | Nicolas Thill <nico@openwrt.org> | 2011-11-08 22:48:11 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2011-11-08 22:48:11 +0000 |
| commit | 4437e7e8fde42355933cc43b7b2c22a0ea3a357e (patch) | |
| tree | d7ac589b0a28152a1c7e58f60d8d29e84b9c6cde /package | |
| parent | 6180fc1f5a526bef8ff1216878eb99949187a4e8 (diff) | |
| download | master-187ad058-4437e7e8fde42355933cc43b7b2c22a0ea3a357e.tar.gz master-187ad058-4437e7e8fde42355933cc43b7b2c22a0ea3a357e.tar.bz2 master-187ad058-4437e7e8fde42355933cc43b7b2c22a0ea3a357e.zip | |
package/relayd: use new service wrappers
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28869 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/relayd/files/relay.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/package/relayd/files/relay.sh b/package/relayd/files/relay.sh index 390900ba3b..9cfdbbb1b2 100644 --- a/package/relayd/files/relay.sh +++ b/package/relayd/files/relay.sh @@ -76,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" @@ -92,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 } |