mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
timemngr: 1.0.10
This commit is contained in:
parent
d9fe7d6927
commit
ef4e5fbef6
3 changed files with 22 additions and 11 deletions
|
|
@ -5,13 +5,13 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=timemngr
|
||||
PKG_VERSION:=1.0.9
|
||||
PKG_VERSION:=1.0.10
|
||||
|
||||
LOCAL_DEV:=0
|
||||
ifneq ($(LOCAL_DEV),1)
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
|
||||
PKG_SOURCE_VERSION:=14987805fa7f85ca8e9cbcc22c3fae55619f2c29
|
||||
PKG_SOURCE_VERSION:=7c6913f97c7e836064b9e8a663666f968d68c5a1
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
PKG_MIRROR_HASH:=skip
|
||||
endif
|
||||
|
|
@ -21,6 +21,8 @@ PKG_LICENSE_FILES:=LICENSE
|
|||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
RSTRIP:=:
|
||||
|
||||
define Package/$(PKG_NAME)
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
|
|
|
|||
|
|
@ -1,15 +1,17 @@
|
|||
#!/bin/sh
|
||||
|
||||
NAME=time
|
||||
|
||||
. /usr/share/libubox/jshn.sh
|
||||
|
||||
log() {
|
||||
echo "${@}"|logger -t time.iface -p info
|
||||
}
|
||||
|
||||
configure_ntp_servers()
|
||||
{
|
||||
local ntp_interface
|
||||
|
||||
# Only change the ntp servers if interface matches with the defined interface
|
||||
ntp_interface="$(uci -q get ${NAME}.dhcp_driven.interface)"
|
||||
ntp_interface="$(uci -q get time.dhcp_driven.interface)"
|
||||
|
||||
if [ "${ntp_interface}" != "${1}" ]; then
|
||||
return 0
|
||||
|
|
@ -19,13 +21,14 @@ configure_ntp_servers()
|
|||
json_select data
|
||||
json_get_var servers ntpserver ""
|
||||
|
||||
exist_dhcp_ntp_server="$(uci -q get ${NAME}.dhcp_driven.server)"
|
||||
exist_dhcp_ntp_server="$(uci -q get time.dhcp_driven.server)"
|
||||
if [ "${servers}" != "${exist_dhcp_ntp_server}" ]; then
|
||||
uci -q del ${NAME}.dhcp_driven.server
|
||||
uci -q del time.dhcp_driven.server
|
||||
for server in ${servers}; do
|
||||
uci -q add_list ${NAME}.dhcp_driven.server="${server}"
|
||||
uci -q add_list time.dhcp_driven.server="${server}"
|
||||
done
|
||||
eval ubus call uci commit '{\"config\":\"$NAME\"}'
|
||||
log "Restarting timemngr"
|
||||
ubus call uci commit '{"config":"time"}'
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@ PROG_UBUS=/usr/sbin/timemngr
|
|||
|
||||
DM_INPUT="/etc/timemngr/input.json"
|
||||
|
||||
log() {
|
||||
echo "${@}"|logger -t time.init -p info
|
||||
}
|
||||
|
||||
validate_global_section() {
|
||||
uci_validate_section time global global \
|
||||
'enable:bool:1' \
|
||||
|
|
@ -21,7 +25,7 @@ start_service() {
|
|||
local enable loglevel
|
||||
|
||||
if uci -q get system.ntp >/dev/null 2>&1; then
|
||||
logger -t timemngr.init "Not starting timemngr, legacy ntp definition detected"
|
||||
log "Not starting timemngr, legacy ntp definition detected"
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
|
@ -45,6 +49,7 @@ start_service() {
|
|||
}
|
||||
|
||||
reload_service() {
|
||||
log "Restarting timemngr"
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
|
@ -58,8 +63,9 @@ service_triggers() {
|
|||
}
|
||||
|
||||
if [ "$enable" != 0 ] && [ "$mode" = "Broadcast" ] && [ -n "$interface" ]; then
|
||||
log "Service trigger for interface up event"
|
||||
procd_open_trigger
|
||||
procd_add_interface_trigger "interface.*.up" $interface /etc/init.d/timemngr restart
|
||||
procd_add_interface_trigger "interface.*.up" $interface /etc/init.d/timemngr reload
|
||||
procd_close_trigger
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue