ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-02 20:16:59 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

busybox: sysntpd: add trigger to reload server

Browse Source 
sysntpd server becomes unavailable if the index of the bound
interface changes. So let's add an interface trigger to reload sysntpd.

This patch also adds the ability for the sysntpd script to handle
uci interface name from configuration.

Fixes: 4da60500ebd2 ("busybox: sysntpd: option to bind server to iface")
Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com>
Reviewed-by: Philip Prindeville <philipp@redfish-solutions.com>
This commit is contained in:
Alexey Dobrovolsky 2021-06-06 02:25:02 +03:00 committed by Baptiste Jonglez
parent 51b61fd570
commit 88114f617a
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/utils/busybox/files/sysntpd
View File

@ -56,7 +56,14 @@ start_ntpd_instance() {
procd_set_param command "$PROG" -n -N procd_set_param command "$PROG" -n -N
if [ "$enable_server" = "1" ]; then if [ "$enable_server" = "1" ]; then
procd_append_param command -l procd_append_param command -l
[ -n "$interface" ] && procd_append_param command -I $interface [ -n "$interface" ] && {
local ifname
network_get_device ifname "$interface" || \
ifname="$interface"
procd_append_param command -I "$ifname"
procd_append_param netdev "$ifname"
}
fi fi
[ -x "$HOTPLUG_SCRIPT" ] && procd_append_param command -S "$HOTPLUG_SCRIPT" [ -x "$HOTPLUG_SCRIPT" ] && procd_append_param command -S "$HOTPLUG_SCRIPT"
for peer in $server; do for peer in $server; do
@ -79,11 +86,12 @@ start_ntpd_instance() {
} }
start_service() { start_service() {
. /lib/functions/network.sh
validate_ntp_section ntp start_ntpd_instance validate_ntp_section ntp start_ntpd_instance
} }
service_triggers() { service_triggers() {
local script name use_dhcp local script name use_dhcp enable_server interface
script=$(readlink -f "$initscript") script=$(readlink -f "$initscript")
name=$(basename ${script:-$initscript}) name=$(basename ${script:-$initscript})
@ -106,5 +114,17 @@ service_triggers() {
fi fi
} }
config_get_bool enable_server ntp enable_server 0
config_get interface ntp interface
[ $enable_server -eq 1 ] && [ -n "$interface" ] && {
local ifname
network_get_device ifname "$interface" || \
ifname="$interface"
procd_add_interface_trigger "interface.*" "$ifname" \
/etc/init.d/"$name" reload
}
procd_add_validation validate_ntp_section procd_add_validation validate_ntp_section
} }