diff options
Diffstat (limited to 'modules.d/slx-clock/hooks/s3-ntp-sync.sh')
| -rwxr-xr-x | modules.d/slx-clock/hooks/s3-ntp-sync.sh | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/modules.d/slx-clock/hooks/s3-ntp-sync.sh b/modules.d/slx-clock/hooks/s3-ntp-sync.sh index 96e72c04..7bbcd14a 100755 --- a/modules.d/slx-clock/hooks/s3-ntp-sync.sh +++ b/modules.d/slx-clock/hooks/s3-ntp-sync.sh @@ -3,51 +3,51 @@ . /etc/openslx -ntp_sync() { - # Try to merge with servers from DHCP. Prefer DHCP, skip duplicates - for SERVER in $SLX_NTP_SERVER; do - if ! echo "$SLX_DHCP_NTP" | grep -wq "$SERVER"; then - SLX_DHCP_NTP="$SLX_DHCP_NTP $SERVER" +# Try to merge with servers from DHCP. Prefer DHCP, skip duplicates +for SERVER in $SLX_NTP_SERVER; do + if ! echo "$SLX_DHCP_NTP" | grep -wq "$SERVER"; then + SLX_DHCP_NTP="$SLX_DHCP_NTP $SERVER" + fi +done +SUCCESS= +for SERVER in $SLX_DHCP_NTP; do + if timeout 3 ntpd -q -n -p "$SERVER"; then + echo "Successfully queried $SERVER for time." + if [ "$SLX_BIOS_CLOCK" = "local" ]; then + usleep 100000 + hwclock -l -w || echo "... but could not set BIOS clock to localtime" + elif [ "$SLX_BIOS_CLOCK" = "utc" ]; then + usleep 100000 + hwclock -u -w || echo "... but could not set BIOS clock to UTC" fi - done - local SUCCESS= - for SERVER in $SLX_DHCP_NTP; do - if timeout 3 ntpd -q -n -p "$SERVER"; then - echo "Successfully queried $SERVER for time." - if [ "x$SLX_BIOS_CLOCK" = "xlocal" ]; then - usleep 100000 - hwclock -l -w || echo "... but could not set BIOS clock to localtime" - elif [ "x$SLX_BIOS_CLOCK" = "xutc" ]; then - usleep 100000 - hwclock -u -w || echo "... but could not set BIOS clock to UTC" + SUCCESS=1 + break + fi + echo "Error querying $SERVER for current time." +done +if [ -z "$SUCCESS" ]; then + echo "No NTP server reachable" + # See if we have a timestamp in our server-config - should only be a few seconds off by now + if [ -n "$SLX_NOW" ] && [ "$SLX_NOW" -gt 1234567890 ]; then + TTS="$SLX_NOW" + CONFIG_DOWNLOAD_TIME=$( cat /tmp/config-download-time 2> /dev/null ) + if [ -n "$CONFIG_DOWNLOAD_TIME" ]; then + # times are in centiseconds + NOW_TIME=$(sed -r 's/^([0-9]+)\.([0-9][0-9]).*$/\1\2/' /proc/uptime) + if [ "$CONFIG_DOWNLOAD_TIME" -gt 0 ] && [ "$NOW_TIME" -gt 0 ]; then + TTS=$(( TTS + ( NOW_TIME - CONFIG_DOWNLOAD_TIME ) / 100 )) fi - SUCCESS=1 - break fi - echo "Error querying $SERVER for current time." - done - if [ -z "$SUCCESS" ]; then - echo "No NTP server reachable" - # See if we have a timestamp in our server-config - should only be a few seconds off by now - if [ -n "$SLX_NOW" ] && [ "$SLX_NOW" -gt 1234567890 ]; then - TTS="$SLX_NOW" - if [ -n "$CONFIG_DOWNLOAD_TIME" ]; then - NOW_TIME=$(sed -r 's/^([0-9]+)\.([0-9]+).*$/\1\2/' /proc/uptime) - if [ "$CONFIG_DOWNLOAD_TIME" -gt 0 ] && [ "$NOW_TIME" -gt 0 ]; then - TTS=$(( TTS + ( NOW_TIME - CONFIG_DOWNLOAD_TIME ) / 100 )) - fi - fi - echo "Setting time to SLX_NOW ($SLX_NOW, corrected $TTS)" - date -s "@$TTS" - else - echo "No fallback option for timesync available, relying on correct RTC setup" - if [ "x$SLX_BIOS_CLOCK" = "xlocal" ]; then - # Linux defaults to RTC = UTC, so read again in this case - hwclock -l -s - fi + echo "Setting time to SLX_NOW ($SLX_NOW, corrected $TTS)" + date -s "@$TTS" + else + echo "No fallback option for timesync available, relying on correct RTC setup" + if [ "$SLX_BIOS_CLOCK" = "local" ]; then + # Linux defaults to RTC = UTC, so read again in this case + hwclock -l -s fi fi - echo "Timesync finished" -} +fi -ntp_sync +echo "Timesync finished" +exit 0 |