sysntpd: remove procd_open_trigger/procd_close_trigger calls

[openwrt/openwrt.git] / package / utils / busybox / files / sysntpd

diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
index ebdda63df96dd10fcf102cea9eed2c385094213c..98260be6084412168d955f3c024d84ff0cd227f9 100755 (executable)
--- a/package/utils/busybox/files/sysntpd
+++ b/package/utils/busybox/files/sysntpd
@@ -5,32 +5,82 @@ START=98
 
 USE_PROCD=1
 PROG=/usr/sbin/ntpd
+HOTPLUG_SCRIPT=/usr/sbin/ntpd-hotplug
 
-start_service() {
-       local peers
-       local args="-n"
-       local enable_server
+get_dhcp_ntp_servers() {
+       local interfaces="$1"
+       local filter="*"
+       local interface ntpservers ntpserver
 
-       config_load system
-       config_get peers ntp server
-       config_get_bool enable_server ntp enable_server 0
+       for interface in $interfaces; do
+               [ "$filter" = "*" ] && filter="@.interface='$interface'" || filter="$filter,@.interface='$interface'"
+       done
 
-       [ $enable_server -eq 0 -a -z "$peers" ] && return
+       ntpservers=$(ubus call network.interface dump | jsonfilter -e "@.interface[$filter]['data']['ntpserver']")
 
-       procd_open_instance
-       procd_set_param command "$PROG" -n
-       [ $enable_server -ne 0 ] && procd_append_param command -l
-       [ -n "$peers" ] && {
-               local peer
-               for peer in $peers; do
-                       procd_append_param command -p $peer
+       for ntpserver in $ntpservers; do
+               local duplicate=0
+               local entry
+               for entry in $server; do
+                       [ "$ntpserver" = "$entry" ] && duplicate=1
                done
+               [ "$duplicate" = 0 ] && server="$server $ntpserver"
+       done
+}
+
+validate_ntp_section() {
+       uci_validate_section system timeserver "${1}" \
+               '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
+
+       validate_ntp_section ntp || {
+               echo "validation failed"
+               return 1
        }
+
+       [ $enabled = 0 ] && return
+
+       [ $use_dhcp = 1 ] && get_dhcp_ntp_servers "$dhcp_interface"
+
+       [ -z "$server" ] && return
+
+       procd_open_instance
+       procd_set_param command "$PROG" -n -N
+       [ "$enable_server" = "1" ] && procd_append_param command -l
+       [ -x "$HOTPLUG_SCRIPT" ] && procd_append_param command -S "$HOTPLUG_SCRIPT"
+       for peer in $server; do
+               procd_append_param command -p $peer
+       done
        procd_set_param respawn
        procd_close_instance
 }
 
-service_triggers()
-{
-       procd_add_reload_trigger "system"
+service_triggers() {
+       local script name use_dhcp
+
+       script=$(readlink -f "$initscript")
+       name=$(basename ${script:-$initscript})
+
+       procd_add_config_trigger "config.change" "system" /etc/init.d/$name reload
+
+       config_load system
+       config_get use_dhcp ntp use_dhcp 1
+
+       [ $use_dhcp = 1 ] && {
+               local dhcp_interface
+               config_get dhcp_interface ntp dhcp_interface
+
+               if [ -n "$dhcp_interface" ]; then
+                       for n in $dhcp_interface; do
+                               procd_add_interface_trigger "interface.*" $n /etc/init.d/$name reload
+                       done
+               else
+                       procd_add_raw_trigger "interface.*" 1000 /etc/init.d/$name reload
+               fi
+       }
+
+       procd_add_validation validate_ntp_section
 }