diff options
| author | Ade Lee <alee@redhat.com> | 2014-04-16 11:20:29 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-05-27 14:51:50 -0400 |
| commit | 462629bab3163be47b2fc6d79b88781f82fdaf15 (patch) | |
| tree | 759df0069974df031577338dafc658ab3c2a5556 /install/tools | |
| parent | 2139db9cb9c05ed84b4c39c50091462fdaff4b6c (diff) | |
| download | freeipa-462629bab3163be47b2fc6d79b88781f82fdaf15.tar.gz freeipa-462629bab3163be47b2fc6d79b88781f82fdaf15.tar.xz freeipa-462629bab3163be47b2fc6d79b88781f82fdaf15.zip | |
Added nolog to pkispawn and some additional fixes from review.
Diffstat (limited to 'install/tools')
| -rw-r--r-- | install/tools/ipa-drm-install | 2 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/install/tools/ipa-drm-install b/install/tools/ipa-drm-install index 7af39a3c7..2a2b2a727 100644 --- a/install/tools/ipa-drm-install +++ b/install/tools/ipa-drm-install @@ -137,7 +137,7 @@ def main(): if options.uninstall: if enable_drm is None: sys.exit("There is no DRM installed on this system") - uninstall(realm_name) + return uninstall(realm_name) if enable_drm is not None and enable_drm == 'True': sys.exit("DRM is already installed.") diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 440d108a6..2ab4e68bc 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -503,6 +503,7 @@ def uninstall(): ca_instance = cainstance.CAInstance( api.env.realm, certs.NSS_DIR, dogtag_constants=dogtag_constants) ca_instance.stop_tracking_certificates(dogtag_constants) + ca_instance.stop_tracking_agent_certificate(dogtag_constants) if ca_instance.is_configured(): ca_instance.uninstall() @@ -762,6 +763,7 @@ def main(): # We only set up the CA if the PKCS#12 options are not given. if options.dirsrv_pkcs12: setup_ca = False + setup_drm = False else: setup_ca = True setup_drm = True |