Removes ntp from dependencies and behave as there is always -N option

Addresses: https://pagure.io/freeipa/issue/7024
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Tibor Dudlák
2018-02-02 13:16:29 +01:00
committed by Rob Crittenden
parent 7b546ffedb
commit bfb544adfd
2 changed files with 1 additions and 12 deletions

View File

@@ -337,7 +337,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
@@ -590,7 +589,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
@@ -1233,15 +1231,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

View File

@@ -3462,7 +3462,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'],
)