From 024644cef3a3cac828251795b43c713fbec34150 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 11 Feb 2019 22:25:14 +0800 Subject: [PATCH] hd-idle: 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. Signed-off-by: Jeffery To --- utils/hd-idle/Makefile | 2 +- utils/hd-idle/files/hd-idle.init | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/utils/hd-idle/Makefile b/utils/hd-idle/Makefile index f7f4645a20..405753d1b9 100644 --- a/utils/hd-idle/Makefile +++ b/utils/hd-idle/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hd-idle PKG_VERSION:=1.05 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Lim Guo Wei PKG_LICENSE:=GPL-2.0 diff --git a/utils/hd-idle/files/hd-idle.init b/utils/hd-idle/files/hd-idle.init index 4f6a2d7a16..bdf9bb8d0a 100644 --- a/utils/hd-idle/files/hd-idle.init +++ b/utils/hd-idle/files/hd-idle.init @@ -8,7 +8,7 @@ USE_PROCD=1 validate_section_hdidle() { - uci_validate_section hd-idle hd-idle "${1}" \ + uci_load_validate hd-idle hd-idle "$1" "$2" \ 'disk:string' \ 'enabled:bool' \ 'idle_time_interval:uinteger:10' \ @@ -43,9 +43,7 @@ compute_seconds() { } hdidle_append() { - local disk enabled idle_time_interval idle_time_unit - - validate_section_hdidle "${1}" || return + [ "$2" = 0 ] || return [ "$enabled" -gt 0 ] || return @@ -63,10 +61,15 @@ start_service() { config_load "hd-idle" numdisks="0" - config_foreach hdidle_append "hd-idle" + config_foreach validate_section_hdidle "hd-idle" hdidle_append if [ "$numdisks" -gt 0 ]; then procd_set_param respawn procd_close_instance fi } + +service_triggers() { + procd_add_reload_trigger "hd-idle" + procd_add_validation validate_section_hdidle +}