Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

socat: Update init script

Browse source 
This replaces the use of uci_validate_section() with
uci_load_validate(), which removes the need to declare local variables
for every config option.

This also adds a service_triggers() function and removes some
unnecessary curly brackets.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To 2019-02-03 19:59:43 +08:00
parent fdc5c5be60
commit 549bf0ec44
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/socat/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=socat PKG_NAME:=socat
PKG_VERSION:=1.7.3.2 PKG_VERSION:=1.7.3.2
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download

20
net/socat/files/socat.init
View file

@ -10,30 +10,32 @@ NAME=socat
validate_section_socat() validate_section_socat()
{ {
uci_validate_section socat socat "${1}" \ uci_load_validate socat socat "$1" "$2" \
'enable:bool:1' \ 'enable:bool:1' \
'SocatOptions:string' 'SocatOptions:string'
return $?
} }
socat_instance() socat_instance()
{ {
local SocatOptions enable [ "$2" = 0 ] || {
validate_section_socat "${1}" || {
echo "validation failed" echo "validation failed"
return 1 return 1
} }
[ "${enable}" = "0" ] && return 1 [ "$enable" = "0" ] && return 1
procd_open_instance procd_open_instance
procd_set_param command "$PROG" procd_set_param command "$PROG"
procd_append_param command ${SocatOptions} procd_append_param command $SocatOptions
procd_close_instance procd_close_instance
} }
start_service () { start_service () {
config_load "${NAME}" config_load "$NAME"
config_foreach socat_instance socat config_foreach validate_section_socat socat socat_instance
}
service_triggers() {
procd_add_reload_trigger "$NAME"
procd_add_validation validate_section_socat
} }