EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lldpd: conversion of init script to procd format

Browse Source 
And add respawn param (the main reason for this conversion).

Signed-off-by: Alexandru Ardelean <aa@ocedo.com>

SVN-Revision: 46968
This commit is contained in:
John Crispin 2015-09-16 08:32:33 +00:00
parent fc19ec21e4
commit 9885e32521
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
package/network/services/lldpd/files/lldpd.init
View File

@ -3,7 +3,7 @@
START=90 START=90
SERVICE_USE_PID=1 USE_PROCD=1
find_release_info() find_release_info()
{ {
@ -14,7 +14,7 @@ find_release_info()
echo "${DISTRIB_DESCRIPTION:-Unknown OpenWrt release} @ $(cat /proc/sys/kernel/hostname)" echo "${DISTRIB_DESCRIPTION:-Unknown OpenWrt release} @ $(cat /proc/sys/kernel/hostname)"
} }
start() { start_service() {
. /lib/functions/network.sh . /lib/functions/network.sh
local enable_cdp local enable_cdp
@ -50,19 +50,24 @@ start() {
mkdir -p /var/run/lldp mkdir -p /var/run/lldp
chown lldp:lldp /var/run/lldp chown lldp:lldp /var/run/lldp
[ -n "$ifnames" ] && append args "-I $ifnames" procd_open_instance
[ $enable_cdp -gt 0 ] && append args '-c' procd_set_param command /usr/sbin/lldpd
[ $enable_fdp -gt 0 ] && append args '-f' procd_append_param command -d # don't daemonize, procd will handle that for us
[ $enable_sonmp -gt 0 ] && append args '-s'
[ $enable_edp -gt 0 ] && append args '-e'
[ $readonly_mode -gt 0 ] && append args '-r'
service_start /usr/sbin/lldpd $args \ [ -n "$ifnames" ] && procd_append_param command "-I $ifnames"
${lldp_class:+ -M $lldp_class} \ [ $enable_cdp -gt 0 ] && procd_append_param command '-c'
${lldp_description:+ -S "$lldp_description"} [ $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() { stop_service() {
service_stop /usr/sbin/lldpd
rm -f /var/run/lldpd.socket /var/run/lldpd.pid rm -f /var/run/lldpd.socket /var/run/lldpd.pid
} }