jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 05:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add SNTP support

Browse Source
This commit is contained in:
Calin Crisan 2019-09-29 11:25:17 +03:00
parent bbc21276af
commit 09a2cf3aab
15 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
board/common/overlay/etc/init.d/S50date
View File

@ -2,6 +2,8 @@
PROG_DATE="/bin/date" PROG_DATE="/bin/date"
PROG_NTPD="/usr/sbin/ntpd" PROG_NTPD="/usr/sbin/ntpd"
PROG_SNTP="/usr/bin/sntp"
LOG_SNTP="/var/log/sntp.log"
SYS_CONF="/etc/date.conf" SYS_CONF="/etc/date.conf"
BOOT_CONF="/boot/date.conf" BOOT_CONF="/boot/date.conf"
@ -55,8 +57,22 @@ set_current_date_ntp() {
fi fi
} }
set_current_date_sntp() {
sntp_args="-t ${DATE_TIMEOUT} -K /var/lib/ntp/kod -Ss"
server=$(cat ${NTP_CONF} | grep server | head -n 1 | cut -d ' ' -f 2)
${PROG_SNTP} ${sntp_args} ${server} &>${LOG_SNTP}
if [[ $? == 0 ]]; then
logger -t date "current system date/time set to $(date) via SNTP"
return 0
else
logger -t date "failed to set current system date/time via SNTP"
return 1
fi
}
start_http() { start_http() {
msg_begin "Setting current date using http" msg_begin "Setting current date using HTTP"
if set_current_date_http; then if set_current_date_http; then
sleep_interval=${DATE_INTERVAL} sleep_interval=${DATE_INTERVAL}
msg_done "$(${PROG_DATE})" msg_done "$(${PROG_DATE})"
@ -79,6 +95,7 @@ start_http() {
start_ntp() { start_ntp() {
mkdir -p /var/lib/ntp mkdir -p /var/lib/ntp
touch /var/lib/ntp/kod
cat ${NTP_CONF} | grep -v iburst > ${NTP_CONF}.tmp cat ${NTP_CONF} | grep -v iburst > ${NTP_CONF}.tmp
@ -91,9 +108,15 @@ start_ntp() {
cat ${NTP_CONF}.tmp >> ${NTP_CONF} cat ${NTP_CONF}.tmp >> ${NTP_CONF}
rm ${NTP_CONF}.tmp rm ${NTP_CONF}.tmp
msg_begin "Setting current date using ntp" if [[ "${DATE_METHOD}" == "sntp" ]]; then
msg_begin "Setting current date using SNTP"
set_current_date_sntp
test $? == 0 && msg_done "$(${PROG_DATE})" || msg_fail
else # assuming ntp
msg_begin "Setting current date using NTP"
set_current_date_ntp || set_current_date_ntp set_current_date_ntp || set_current_date_ntp
test $? == 0 && msg_done "$(${PROG_DATE})" || msg_fail test $? == 0 && msg_done "$(${PROG_DATE})" || msg_fail
fi
msg_begin "Starting ntpd" msg_begin "Starting ntpd"
${PROG_NTPD} -g -c ${NTP_CONF} ${PROG_NTPD} -g -c ${NTP_CONF}
@ -115,7 +138,7 @@ stop_ntp() {
start() { start() {
if [[ "${DATE_METHOD}" == "http" ]]; then if [[ "${DATE_METHOD}" == "http" ]]; then
start_http start_http
else else # ntp or sntp
start_ntp start_ntp
fi fi
@ -125,7 +148,7 @@ start() {
stop() { stop() {
if [[ "${DATE_METHOD}" == "http" ]]; then if [[ "${DATE_METHOD}" == "http" ]]; then
stop_http stop_http
else else # ntp or sntp
stop_ntp stop_ntp
fi fi
} }
@ -150,4 +173,3 @@ case "$1" in
esac esac
exit $? exit $?

2
configs/bananapim1_defconfig
View File

@ -66,7 +66,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/nanopineo2_defconfig
View File

@ -58,7 +58,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/nanopineo_defconfig
View File

@ -58,7 +58,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/odroidc1_defconfig
View File

@ -70,7 +70,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/odroidc2_defconfig
View File

@ -58,7 +58,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/odroidxu4_defconfig
View File

@ -60,7 +60,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/orangepione_defconfig
View File

@ -61,7 +61,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/orangepizero_defconfig
View File

@ -61,7 +61,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/pine64_defconfig
View File

@ -57,7 +57,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/raspberrypi2_defconfig
View File

@ -64,7 +64,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/raspberrypi3_defconfig
View File

@ -64,7 +64,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/raspberrypi4_defconfig
View File

@ -64,7 +64,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/raspberrypi_defconfig
View File

@ -71,7 +71,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y

2
configs/tinkerboard_defconfig
View File

@ -61,7 +61,7 @@ BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_SNTP=y
BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_PPPD=y BR2_PACKAGE_PPPD=y
BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS=y