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

Merge branch 'master' of github.com:ccrisan/thingos

Browse Source
This commit is contained in:
Calin Crisan 2017-10-03 22:32:32 +03:00
commit a55c4a679c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
# Date executable points to /bin/busybox\ date explicitly in the cases that date binary gets overwritten
date_exec=/bin/busybox\ date
sys_conf="/etc/date.conf" sys_conf="/etc/date.conf"
boot_conf="/boot/date.conf" boot_conf="/boot/date.conf"
conf="/data/etc/date.conf" conf="/data/etc/date.conf"
@ -41,7 +44,7 @@ source $conf
set_current_date_http() { set_current_date_http() {
date_str=$(curl -v -s -m $date_timeout -X GET http://$date_host 2>&1 | grep Date | sed -e 's/< Date: //') date_str=$(curl -v -s -m $date_timeout -X GET http://$date_host 2>&1 | grep Date | sed -e 's/< Date: //')
test -z "$date_str" && return 1 test -z "$date_str" && return 1
date -u -D "%a, %d %b %Y %H:%M:%S" -s "$date_str" > /dev/null $date_exec -u -D "%a, %d %b %Y %H:%M:%S" -s "$date_str" > /dev/null
return $? return $?
} }
@ -52,7 +55,7 @@ set_current_date_ntp() {
start_http() { start_http() {
msg_begin "Setting current date using http" msg_begin "Setting current date using http"
set_current_date_http || set_current_date_http set_current_date_http || set_current_date_http
test $? == 0 && msg_done "$(date)" || msg_fail test $? == 0 && msg_done "$($date_exec)" || msg_fail
msg_begin "Starting http date updater" msg_begin "Starting http date updater"
while true; do while true; do
@ -78,7 +81,7 @@ start_ntp() {
msg_begin "Setting current date using 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 "$(date)" || msg_fail test $? == 0 && msg_done "$($date_exec)" || msg_fail
msg_begin "Starting ntpd" msg_begin "Starting ntpd"
ntpd -g -c $ntp_conf ntpd -g -c $ntp_conf
@ -104,7 +107,7 @@ start() {
start_ntp start_ntp
fi fi
echo "system date is $(date '+%Y-%m-%d %H:%M:%S')" > /dev/kmsg echo "system date is $($date_exec '+%Y-%m-%d %H:%M:%S')" > /dev/kmsg
} }
stop() { stop() {