diff options
| author | David Kupka <dkupka@redhat.com> | 2014-07-08 07:36:48 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-07-08 10:29:13 +0200 |
| commit | 2ff14607b170c86ccd93cff60f5a34d64cd1e419 (patch) | |
| tree | df940a9dfa4d50000eede64b6e30436908b88058 | |
| parent | 1e58588ec274d5da0f020b2c6af2824313ea0ea7 (diff) | |
| download | freeipa-2ff14607b170c86ccd93cff60f5a34d64cd1e419.tar.gz freeipa-2ff14607b170c86ccd93cff60f5a34d64cd1e419.tar.xz freeipa-2ff14607b170c86ccd93cff60f5a34d64cd1e419.zip | |
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 <pviktori@redhat.com>
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 5 |
1 files changed, 4 insertions, 1 deletions
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() |