URL: https://github.com/freeipa/freeipa/pull/1535
Author: Tiboris
Title: #1535: [WIP] Deprecate NTP
Action: opened
PR body:
"""
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/1535/head:pr1535
git checkout pr1535
From 6ceb7bf604777a0069e1fc871d154bcef5a1519d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Dudl=C3=A1k?= <tdud...@redhat.com>
Date: Fri, 2 Feb 2018 13:16:29 +0100
Subject: [PATCH] [WIP] Deprecate NTP
---
freeipa.spec.in | 11 -----------
ipaclient/install/client.py | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index be2cb869a5..24793eceb8 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -322,7 +322,6 @@ Requires(post): krb5-server >= %{krb5_version}
Requires(post): krb5-server >= %{krb5_base_version}, krb5-server < %{krb5_base_version}.100
Requires: krb5-pkinit-openssl >= %{krb5_version}
Requires: cyrus-sasl-gssapi%{?_isa}
-Requires: ntp
Requires: httpd >= 2.4.6-31
%if 0%{with_python3}
Requires(preun): python3
@@ -579,7 +578,6 @@ Requires: python2-ldap >= %{python2_ldap_version}
Requires: python2-sssdconfig
%endif
Requires: cyrus-sasl-gssapi%{?_isa}
-Requires: ntp
Requires: krb5-workstation >= %{krb5_version}
Requires: authconfig
Requires: curl
@@ -1269,15 +1267,6 @@ if [ $1 -gt 1 ] ; then
fi
fi
- if [ -f '/etc/sysconfig/ntpd' -a $restore -ge 2 ]; then
- if grep -E -q 'OPTIONS=.*-u ntp:ntp' /etc/sysconfig/ntpd 2>/dev/null; then
- sed -r '/OPTIONS=/ { s/\s+-u ntp:ntp\s+/ /; s/\s*-u ntp:ntp\s*// }' /etc/sysconfig/ntpd >/etc/sysconfig/ntpd.ipanew
- mv -Z /etc/sysconfig/ntpd.ipanew /etc/sysconfig/ntpd
-
- /bin/systemctl condrestart ntpd.service 2>&1 || :
- fi
- fi
-
if [ $restore -ge 2 ]; then
%{python} -c 'from ipaclient.install.client import update_ipa_nssdb; update_ipa_nssdb()' >/var/log/ipaupgrade.log 2>&1
fi
diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
index 5173d90bfe..543697c460 100644
--- a/ipaclient/install/client.py
+++ b/ipaclient/install/client.py
@@ -3442,7 +3442,7 @@ class ClientInstallInterface(hostname_.HostNameInstallInterface,
ntp_servers = enroll_only(ntp_servers)
no_ntp = knob(
- None,
+ None, True,
description="do not configure ntp",
cli_names=[None, '-N'],
)
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
