mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

gpsd: 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 <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To 2019-02-11 22:05:23 +08:00
parent 1d4081dd4c
commit bd5a6155b1
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/gpsd/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gpsd PKG_NAME:=gpsd
PKG_VERSION:=3.17 PKG_VERSION:=3.17
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME) PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME)

23
utils/gpsd/files/gpsd.init
View File

@ -8,7 +8,7 @@ NAME=gpsd
validate_section_gpsd() validate_section_gpsd()
{ {
uci_validate_section gpsd gpsd "${1}" \ uci_load_validate gpsd gpsd "$1" "$2" \
'enabled:bool:1' \ 'enabled:bool:1' \
'device:string' \ 'device:string' \
'listen_globally:bool:0' \ 'listen_globally:bool:0' \
@ -17,21 +17,19 @@ validate_section_gpsd()
gpsd_instance() gpsd_instance()
{ {
local device enabled listen_globally port [ "$2" = 0 ] || {
validate_section_gpsd "${1}" || {
echo "validation failed" echo "validation failed"
return 1 return 1
} }
[ "${enabled}" = "0" ] && return 1 [ "$enabled" = "0" ] && return 1
procd_open_instance procd_open_instance
procd_set_param command "$PROG" -N -n procd_set_param command "$PROG" -N -n
[ "${listen_globally}" -ne 0 ] && procd_append_param command -G [ "$listen_globally" -ne 0 ] && procd_append_param command -G
procd_append_param command -S "${port}" procd_append_param command -S "$port"
procd_append_param command "${device}" procd_append_param command "$device"
procd_set_param respawn procd_set_param respawn
procd_close_instance procd_close_instance
@ -39,6 +37,11 @@ gpsd_instance()
start_service() start_service()
{ {
config_load "${NAME}" config_load "$NAME"
config_foreach gpsd_instance gpsd config_foreach validate_section_gpsd gpsd gpsd_instance
}
service_triggers() {
procd_add_reload_trigger "$NAME"
procd_add_validation validate_section_gpsd
} }