ntpd: 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 moves the generated config file to /var/etc and adds a
service_triggers() function.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>

diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index 8c16d7b285161e1decb31b12b1fe6a22ab9bf8ce..386d37d365f15b9ad019f2d67a93acac5450c491 100644 (file)
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntp
 PKG_VERSION:=4.2.8p12
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/

diff --git a/net/ntpd/files/ntpd.init b/net/ntpd/files/ntpd.init
index 0aaf132a4406a198acd6b981658e5ab71a8a2e1e..6e73489d4ae8e7842eaf0a2c753b314c1dd1fd7f 100644 (file)
--- a/net/ntpd/files/ntpd.init
+++ b/net/ntpd/files/ntpd.init
@@ -8,7 +8,7 @@ USE_PROCD=1
 PROG=/sbin/ntpd
 HOTPLUG_HELPER=/usr/sbin/ntpd.hotplug-helper
 
-config_file=/var/run/ntpd.conf
+config_file=/var/etc/ntpd.conf
 
 trunc() {
        echo -n "" > $config_file
@@ -19,15 +19,15 @@ emit() {
 }
 
 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' \
                'interface:list(string)'
 }
 
-start_service() {
-       local server enabled enable_server interface intf
+start_ntpd_instance() {
+       local intf i
 
-       validate_ntp_section ntp || {
+       [ "$2" = 0 ] || {
                echo "validation failed"
                return 1
        }
@@ -85,3 +85,12 @@ start_service() {
        procd_set_param command $HOTPLUG_HELPER
        procd_close_instance
 }
+
+start_service() {
+       validate_ntp_section ntp start_ntpd_instance
+}
+
+service_triggers() {
+       procd_add_reload_trigger "system"
+       procd_add_validation validate_ntp_section
+}