summarylogtreecommitdiffstats
path: root/0004-NTP-Fixes.patch
blob: 3cbf2a21f3c3c065ce6c4c7085b4be2db9e5251a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From 2b3e1e8cf40dd1ea203da3f50625277c5f9c253b Mon Sep 17 00:00:00 2001
From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
Date: Wed, 16 Apr 2014 19:33:44 -0400
Subject: [PATCH 4/7] NTP Fixes

---
 ipa-client/ipaclient/ntpconf.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ipa-client/ipaclient/ntpconf.py b/ipa-client/ipaclient/ntpconf.py
index 7c95a46..4a39200 100644
--- a/ipa-client/ipaclient/ntpconf.py
+++ b/ipa-client/ipaclient/ntpconf.py
@@ -109,9 +109,9 @@ def config_ntp(server_fqdn, fstore = None, sysstore = None):
     if os.path.exists(path_step_tickers):
         config_step_tickers = True
         ns = ipautil.template_str(ntp_step_tickers, sub_dict)
-        __backup_config(path_step_tickers, fstore)
-        __write_config(path_step_tickers, ns)
-        ipaservices.restore_context(path_step_tickers)
+        #__backup_config(path_step_tickers, fstore)
+        #__write_config(path_step_tickers, ns)
+        #ipaservices.restore_context(path_step_tickers)
 
     if sysstore:
         module = 'ntp'
@@ -146,7 +146,7 @@ def synconce_ntp(server_fqdn):
     if os.path.exists(ntpdate):
         # retry several times -- logic follows /etc/init.d/ntpdate
         # implementation
-        cmd = [ntpdate, "-U", "ntp", "-s", "-b", "-v", server_fqdn]
+        cmd = [ntpdate, "-s", "-b", "-v", server_fqdn]
         for retry in range(0, 3):
             try:
                 ipautil.run(cmd)
-- 
1.9.2