Fix uninstall stopping ipa.service

When uninstalling systemd is told to disable the service, but it is not
told to sopt it, so it believes it is still running. This can cause
issues in some cases if a reinstall is performed right after an
uninstall, as systemd may decide to stop the disabled service while we
are reinstalling, causing the new install to fail.

https://fedorahosted.org/freeipa/ticket/5959

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Simo Sorce 2017-01-25 08:56:15 -05:00 committed by Jan Cholasta
parent 4bd2d6ad46
commit 00a9d2f94d

View File

@ -1034,9 +1034,13 @@ def uninstall(installer):
print("Shutting down all IPA services") print("Shutting down all IPA services")
try: try:
run([paths.IPACTL, "stop"], raiseonerr=False) services.knownservices.ipa.stop()
except Exception: except Exception:
pass # Fallback to direct ipactl stop only if system command fails
try:
run([paths.IPACTL, "stop"], raiseonerr=False)
except Exception:
pass
ntpinstance.NTPInstance(fstore).uninstall() ntpinstance.NTPInstance(fstore).uninstall()