From 549bf0ec4448f8e52ba4563be61596ff1606eb4e Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Sun, 3 Feb 2019 19:59:43 +0800 Subject: socat: Update init script 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 --- net/socat/files/socat.init | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'net/socat/files') diff --git a/net/socat/files/socat.init b/net/socat/files/socat.init index 379dc070f..b41293573 100644 --- a/net/socat/files/socat.init +++ b/net/socat/files/socat.init @@ -10,30 +10,32 @@ NAME=socat validate_section_socat() { - uci_validate_section socat socat "${1}" \ + uci_load_validate socat socat "$1" "$2" \ 'enable:bool:1' \ 'SocatOptions:string' - return $? } socat_instance() { - local SocatOptions enable - - validate_section_socat "${1}" || { + [ "$2" = 0 ] || { echo "validation failed" return 1 } - [ "${enable}" = "0" ] && return 1 + [ "$enable" = "0" ] && return 1 procd_open_instance procd_set_param command "$PROG" - procd_append_param command ${SocatOptions} + procd_append_param command $SocatOptions procd_close_instance } start_service () { - config_load "${NAME}" - config_foreach socat_instance socat + config_load "$NAME" + config_foreach validate_section_socat socat socat_instance +} + +service_triggers() { + procd_add_reload_trigger "$NAME" + procd_add_validation validate_section_socat } -- cgit v1.2.3