summaryrefslogtreecommitdiffstats
path: root/install/tools/ipactl
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-08-29 11:16:52 -0400
committerRob Crittenden <rcritten@redhat.com>2011-08-29 16:49:52 -0400
commit91c9e8320932124ff77178383a0531fb2b218f2f (patch)
tree7b0b634de14e385f76cd9fddb5af6f9cad786fdf /install/tools/ipactl
parent28e6d137afa65f638ea6e748eb39bce9aa83e403 (diff)
downloadfreeipa-91c9e8320932124ff77178383a0531fb2b218f2f.tar.gz
freeipa-91c9e8320932124ff77178383a0531fb2b218f2f.tar.xz
freeipa-91c9e8320932124ff77178383a0531fb2b218f2f.zip
Add common is_installed() fn, better uninstall logging, check for errors.
The installer and ipactl used two different methods to determine whether IPA was configured, unify them. When uninstalling report any thing that looks suspicious and warn that a re-install may fail. This includes any remaining 389-ds instances and any state or files that remains after all the module uninstallers are complete. Add wrappers for removing files and directories to log failures. https://fedorahosted.org/freeipa/ticket/1715
Diffstat (limited to 'install/tools/ipactl')
-rwxr-xr-xinstall/tools/ipactl3
1 files changed, 2 insertions, 1 deletions
diff --git a/install/tools/ipactl b/install/tools/ipactl
index 313b87662..f7b2adcfd 100755
--- a/install/tools/ipactl
+++ b/install/tools/ipactl
@@ -23,6 +23,7 @@ try:
import os
from ipaserver.install import service
from ipaserver.install.dsinstance import config_dirname, realm_to_serverid
+ from ipaserver.install.installutils import is_ipa_configured
from ipapython import sysrestore
from ipapython import config
from ipalib import api, errors
@@ -51,7 +52,7 @@ class IpactlError(StandardError):
return self.msg
def check_IPA_configuration():
- if not sysrestore.FileStore('/var/lib/ipa/sysrestore').has_files():
+ if not is_ipa_configured():
# LSB status code 6: program is not configured
raise IpactlError("IPA is not configured " +
"(see man pages of ipa-server-install for help)", 6)