xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5425 from neo954/ubuntu-18.04

Browse Source 
Tweak for setupntp. Ubuntu use chrony.service instead of chronyd.service
This commit is contained in:
zet809 2018-07-24 17:15:48 +08:00 committed by GitHub
commit c494001ba2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT/postscripts/setupntp
View File

@ -151,7 +151,10 @@ systemctl disable ntpd.service 2>/dev/null
systemctl disable ntp-wait.service 2>/dev/null
systemctl disable ntpdate.service 2>/dev/null
systemctl stop chronyd.service
# On Ubuntu 18.04
systemctl stop chrony.service 2>/dev/null
# On RHEL 7, 8
systemctl stop chronyd.service 2>/dev/null
# The system is configured to maintain the RTC in universal time.
timedatectl set-local-rtc 0
@ -291,11 +294,13 @@ log measurements statistics tracking
EOF
exit_if_bad "$?" "Failed to create configuration file for chrony"
systemctl reenable chronyd.service
exit_if_bad "$?" "Failed to enable chronyd.service"
systemctl reenable chrony.service 2>/dev/null ||
systemctl reenable chronyd.service 2>/dev/null
exit_if_bad "$?" "Failed to enable chrony service"
systemctl reload-or-restart chronyd.service
exit_if_bad "$?" "Failed to start chronyd.service"
systemctl reload-or-restart chrony.service 2>/dev/null ||
systemctl reload-or-restart chronyd.service 2>/dev/null
exit_if_bad "$?" "Failed to start chrony service"
logger -t xcat -p local4.info "NTP setup accomplished!"