Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ntp] enable/disable NTP long jump according to reboot type #4577

Merged
merged 4 commits into from
May 20, 2020
Merged

[ntp] enable/disable NTP long jump according to reboot type #4577

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bdb8a7
[ntp] enable/disable NTP long jump according to reboot type
yxieca May 12, 2020
2c95fa7
fix typo
yxieca May 12, 2020
e2a1920
further refactoring
yxieca May 12, 2020
8157acf
use sonic-db-cli instead
yxieca May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions files/image_config/ntp/ntp-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
#!/bin/bash

ntp_default_file='/etc/default/ntp'
ntp_temp_file='/tmp/ntp.orig'

reboot_type='cold'

function get_database_reboot_type()
{
SYSTEM_WARM_START=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_ENABLE_TABLE|system" enable`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use sonic-db-cli for multi-db support.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Changed.

SYSTEM_FAST_START=`/usr/bin/redis-cli -n 6 get "FAST_REBOOT|system"`

if [[ x"${SYSTEM_WARM_START}" == x"true" ]]; then
reboot_type='warm'
elif [[ x"${SYSTEM_FAST_START}" == x"1" ]]; then
reboot_type='fast'
fi
}

function modify_ntp_default
{
cp ${ntp_default_file} ${ntp_temp_file}
sed -e "$1" ${ntp_temp_file} >${ntp_default_file}
pavel-shirshov marked this conversation as resolved.
Show resolved Hide resolved
}

sonic-cfggen -d -t /usr/share/sonic/templates/ntp.conf.j2 >/etc/ntp.conf

get_database_reboot_type
if [[ x"${reboot_type}" == x"cold" ]]; then
echo "Enabling NTP long jump for reboot type ${reboot_type} ..."
modify_ntp_default "s/NTPD_OPTS='-x'/NTPD_OPTS='-g'/"
else
echo "Disabling NTP long jump for reboot type ${reboot_type} ..."
modify_ntp_default "s/NTPD_OPTS='-g'/NTPD_OPTS='-x'/"
fi

systemctl restart ntp