https://fedorahosted.org/freeipa/ticket/6046
From b35b2154984df77bdaf08bc82c227ea9f801ed00 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka <slazn...@redhat.com> Date: Mon, 11 Jul 2016 13:17:32 +0200 Subject: [PATCH] Don't show --force-ntpd option in replica install Don't show the warning message part about --force-ntpd when ipa-client-install is run from replica installation (the client install is run in unattended mode). https://fedorahosted.org/freeipa/ticket/6046 --- client/ipa-client-install | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/client/ipa-client-install b/client/ipa-client-install index 8546ff8b0dbea0f28fba12a00c2ee1868ec7c3c6..7ef8c0767a2a77004766660b726def90ed438f53 100755 --- a/client/ipa-client-install +++ b/client/ipa-client-install @@ -2241,11 +2241,13 @@ def install(options, env, fstore, statestore): try: ipaclient.ntpconf.check_timedate_services() except ipaclient.ntpconf.NTPConflictingService as e: - print("WARNING: ntpd time&date synchronization service will not" \ - " be configured as") - print("conflicting service (%s) is enabled" % e.conflicting_service) - print("Use --force-ntpd option to disable it and force configuration" \ - " of ntpd") + print( + "WARNING: ntpd time&date synchronization service will not" + " be configured as conflicting service (%s) is enabled" + % e.conflicting_service) + if not options.unattended: + print("Use --force-ntpd option to disable it and force " + "configuration of ntpd") print("") # configuration of ntpd is disabled in this case -- 2.7.4
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
