summaryrefslogtreecommitdiffstats
path: root/install/tools
diff options
context:
space:
mode:
authorNikolai Kondrashov <Nikolai.Kondrashov@redhat.com>2012-09-10 14:11:40 +0300
committerMartin Kosek <mkosek@redhat.com>2012-10-16 09:12:41 +0200
commit92331c0074465b5c105973086467fa17a3d6d957 (patch)
tree753f142d171df87504fed38a6585e72b678ce3f2 /install/tools
parent2d7f2928b9e66e8870262a30c4f542951f869796 (diff)
downloadfreeipa-92331c0074465b5c105973086467fa17a3d6d957.tar.gz
freeipa-92331c0074465b5c105973086467fa17a3d6d957.tar.xz
freeipa-92331c0074465b5c105973086467fa17a3d6d957.zip
Add uninstall command hints to ipa-*-install
Add uninstall command to the uninstall instructions in the "already installed" responses of ipa-server-install, ipa-client-install and ipa-replica-install. https://fedorahosted.org/freeipa/ticket/3065
Diffstat (limited to 'install/tools')
-rwxr-xr-xinstall/tools/ipa-replica-install5
-rwxr-xr-xinstall/tools/ipa-server-install10
2 files changed, 9 insertions, 6 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index 92e5f8659..b56fa2ea5 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -407,8 +407,9 @@ def main():
client_fstore = sysrestore.FileStore('/var/lib/ipa-client/sysrestore')
if client_fstore.has_files():
- sys.exit("IPA client is already configured on this system.\n"
- + "Please uninstall it first before configuring the replica.")
+ sys.exit("IPA client is already configured on this system.\n" +
+ "Please uninstall it first before configuring the replica, " +
+ "using 'ipa-client-install --uninstall'.")
global sstore
sstore = sysrestore.StateFile('/var/lib/ipa/sysrestore')
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 37d37b81a..33e1c257f 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -574,14 +574,16 @@ def main():
print "\nThe log file for this installation can be found in /var/log/ipaserver-install.log"
if not options.external_ca and not options.external_cert_file and is_ipa_configured():
installation_cleanup = False
- sys.exit("IPA server is already configured on this system.\n"
- + "If you want to reinstall the IPA server please uninstall it first.")
+ sys.exit("IPA server is already configured on this system.\n" +
+ "If you want to reinstall the IPA server, please uninstall " +
+ "it first using 'ipa-server-install --uninstall'.")
client_fstore = sysrestore.FileStore('/var/lib/ipa-client/sysrestore')
if client_fstore.has_files():
installation_cleanup = False
- sys.exit("IPA client is already configured on this system.\n"
- + "Please uninstall it first before configuring the IPA server.")
+ sys.exit("IPA client is already configured on this system.\n" +
+ "Please uninstall it before configuring the IPA server, " +
+ "using 'ipa-client-install --uninstall'")
root_logger.debug('%s was invoked with options: %s' % (sys.argv[0], safe_options))
root_logger.debug("missing options might be asked for interactively later\n")