diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2019-01-13 02:14:22 +0800 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-01-22 09:05:59 +0100 |
| commit | d13e86d4c2d4c1c8970a20cc1f3214b266f57ed0 (patch) | |
| tree | 4873e6e71897ed65034302a8e4ee349cfee69781 /package/utils | |
| parent | 2bf22b1fb725b71ca1ec2656be4b020efcc29289 (diff) | |
| download | upstream-d13e86d4c2d4c1c8970a20cc1f3214b266f57ed0.tar.gz upstream-d13e86d4c2d4c1c8970a20cc1f3214b266f57ed0.tar.bz2 upstream-d13e86d4c2d4c1c8970a20cc1f3214b266f57ed0.zip | |
procd: Add wrapper for uci_validate_section()
This adds a wrapper (uci_load_validate) for uci_validate_section() that
allows callers (through a callback function) to access the values set by
uci_validate_section(), without having to manually declare a
(potentially long) list of local variables.
The callback function receives two arguments when called, the config
section name and the return value of uci_validate_section().
If no callback function is given, then the wrapper exits with the value
returned by uci_validate_section().
This also updates several init scripts to use the new wrapper function.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'package/utils')
| -rwxr-xr-x | package/utils/busybox/files/sysntpd | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd index e693e4031c..52866ba32a 100755 --- a/package/utils/busybox/files/sysntpd +++ b/package/utils/busybox/files/sysntpd @@ -29,14 +29,14 @@ get_dhcp_ntp_servers() { } validate_ntp_section() { - uci_validate_section system timeserver "${1}" \ + uci_load_validate system timeserver "$1" "$2" \ 'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0' 'use_dhcp:bool:1' 'dhcp_interface:list(string)' } -start_service() { - local server enabled enable_server use_dhcp dhcp_interface peer +start_ntpd_instance() { + local peer - validate_ntp_section ntp || { + [ "$2" = 0 ] || { echo "validation failed" return 1 } @@ -58,6 +58,10 @@ start_service() { procd_close_instance } +start_service() { + validate_ntp_section ntp start_ntpd_instance +} + service_triggers() { local script name use_dhcp |