From 2ff14607b170c86ccd93cff60f5a34d64cd1e419 Mon Sep 17 00:00:00 2001 From: David Kupka Date: Tue, 8 Jul 2014 07:36:48 +0200 Subject: Fix ipa-client-install --uninstall crash Fix ipa-client-install crash when chronyd service fails to start. https://fedorahosted.org/freeipa/ticket/4273 Reviewed-By: Petr Viktorin --- ipa-client/ipa-install/ipa-client-install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index bfa43b146..617db26f4 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -692,7 +692,10 @@ def uninstall(options, env): if restored: services.knownservices.ntpd.restart() - ipaclient.ntpconf.restore_forced_ntpd(statestore) + try: + ipaclient.ntpconf.restore_forced_ntpd(statestore) + except CalledProcessError, e: + root_logger.error('Failed to start chronyd: %s', e) if was_sshd_configured and services.knownservices.sshd.is_running(): services.knownservices.sshd.restart() -- cgit