URL: https://github.com/freeipa/freeipa/pull/4454 Author: rcritten Title: #4454: Don't configure ntpd with -x Action: opened
PR body: """ slew mode (-x) may break ntpd from starting if time slew is too great between the system and hardware clock. Slew mode is an unstable configuration choice and has many known drawbacks. https://pagure.io/freeipa/issue/8242 Signed-off-by: Rob Crittenden <rcrit...@redhat.com> This applies **only** to the ipa-4-6 branch. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/4454/head:pr4454 git checkout pr4454
From a1e8b53526379428668f1924fae751872bd1b003 Mon Sep 17 00:00:00 2001 From: Rob Crittenden <rcrit...@redhat.com> Date: Fri, 20 Mar 2020 09:01:39 -0400 Subject: [PATCH] Don't configure ntpd with -x slew mode (-x) may break ntpd from starting if time slew is too great between the system and hardware clock. Slew mode is an unstable configuration choice and has many known drawbacks. https://pagure.io/freeipa/issue/8242 Signed-off-by: Rob Crittenden <rcrit...@redhat.com> --- ipaclient/install/ntpconf.py | 2 +- ipaserver/install/ntpinstance.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ipaclient/install/ntpconf.py b/ipaclient/install/ntpconf.py index e90ec068aa..21cfdc4c6f 100644 --- a/ipaclient/install/ntpconf.py +++ b/ipaclient/install/ntpconf.py @@ -80,7 +80,7 @@ #controlkey 8 """ -ntp_sysconfig = """OPTIONS="-x -p /var/run/ntpd.pid" +ntp_sysconfig = """OPTIONS="-p /var/run/ntpd.pid" # Set to 'yes' to sync hw clock after successful ntpdate SYNC_HWCLOCK=yes diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py index 10997343c4..d38fd2e129 100644 --- a/ipaserver/install/ntpinstance.py +++ b/ipaserver/install/ntpinstance.py @@ -91,8 +91,7 @@ def __write_config(self): fd.write("{}\n".format(' '.join(fudge))) #read in memory, find OPTIONS, check/change it, then overwrite file - needopts = [ {'val':'-x', 'need':True}, - {'val':'-g', 'need':True} ] + needopts = [ {'val':'-g', 'need':True} ] fd = open(paths.SYSCONFIG_NTPD, "r") lines = fd.readlines() fd.close()
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org
