diff options
| author | John Crispin <blogic@openwrt.org> | 2015-09-16 08:32:33 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-09-16 08:32:33 +0000 |
| commit | 85aa424b0af53abe32a2b3567f2493adb1642a2e (patch) | |
| tree | 933b055fd041a8648dd6f056a948b3f2b0075c65 /package/network/services/lldpd | |
| parent | 49a8ac41332ed8428e333b033729d4740fa9ea0d (diff) | |
| download | master-187ad058-85aa424b0af53abe32a2b3567f2493adb1642a2e.tar.gz master-187ad058-85aa424b0af53abe32a2b3567f2493adb1642a2e.tar.bz2 master-187ad058-85aa424b0af53abe32a2b3567f2493adb1642a2e.zip | |
lldpd: conversion of init script to procd format
And add respawn param (the main reason for this conversion).
Signed-off-by: Alexandru Ardelean <aa@ocedo.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46968 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/lldpd')
| -rw-r--r-- | package/network/services/lldpd/files/lldpd.init | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init index bd957b672b..fca0ebfcc7 100644 --- a/package/network/services/lldpd/files/lldpd.init +++ b/package/network/services/lldpd/files/lldpd.init @@ -3,7 +3,7 @@ START=90 -SERVICE_USE_PID=1 +USE_PROCD=1 find_release_info() { @@ -14,7 +14,7 @@ find_release_info() echo "${DISTRIB_DESCRIPTION:-Unknown OpenWrt release} @ $(cat /proc/sys/kernel/hostname)" } -start() { +start_service() { . /lib/functions/network.sh local enable_cdp @@ -50,19 +50,24 @@ start() { mkdir -p /var/run/lldp chown lldp:lldp /var/run/lldp - [ -n "$ifnames" ] && append args "-I $ifnames" - [ $enable_cdp -gt 0 ] && append args '-c' - [ $enable_fdp -gt 0 ] && append args '-f' - [ $enable_sonmp -gt 0 ] && append args '-s' - [ $enable_edp -gt 0 ] && append args '-e' - [ $readonly_mode -gt 0 ] && append args '-r' + procd_open_instance + procd_set_param command /usr/sbin/lldpd + procd_append_param command -d # don't daemonize, procd will handle that for us - service_start /usr/sbin/lldpd $args \ - ${lldp_class:+ -M $lldp_class} \ - ${lldp_description:+ -S "$lldp_description"} + [ -n "$ifnames" ] && procd_append_param command "-I $ifnames" + [ $enable_cdp -gt 0 ] && procd_append_param command '-c' + [ $enable_fdp -gt 0 ] && procd_append_param command '-f' + [ $enable_sonmp -gt 0 ] && procd_append_param command '-s' + [ $enable_edp -gt 0 ] && procd_append_param command '-e' + [ $readonly_mode -gt 0 ] && procd_append_param command '-r' + [ -n "$lldp_class" ] && procd_append_param command "-M $lldp_class" + [ -n "$lldp_description" ] && procd_append_param command "-S $lldp_description" + + # set auto respawn behavior + procd_set_param respawn + procd_close_instance } -stop() { - service_stop /usr/sbin/lldpd +stop_service() { rm -f /var/run/lldpd.socket /var/run/lldpd.pid } |