From 5a9a9723deffbeef23248e0f145788c9159b726a Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Thu, 24 Feb 2011 13:02:27 +0100 Subject: IPA replica/server install does not check for a client When IPA replica or server is configured it does not check for possibly installed client. This will cause the installation to fail in the very end. This patch adds a check for already configured client and suggests removing it before server/replica installation. https://fedorahosted.org/freeipa/ticket/1002 --- install/tools/ipa-replica-install | 5 +++++ install/tools/ipa-server-install | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 590fd645..17f5cbc3 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -343,6 +343,11 @@ def main(): if not ipautil.file_exists(filename): sys.exit("Replica file %s does not exist" % filename) + 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.") + global sstore sstore = sysrestore.StateFile('/var/lib/ipa/sysrestore') diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 6ae02d89..6fd39336 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -481,6 +481,11 @@ def main(): if (dsinstance.DsInstance().is_configured() or cainstance.CADSInstance().is_configured()) and not options.external_cert_file: sys.exit("IPA server is already configured on this system.") + 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 IPA server.") + logging.debug('%s was invoked with options: %s' % (sys.argv[0], safe_options)) logging.debug("missing options might be asked for interactively later\n") -- cgit