From af50f341adea4a10b5b6aa8e43193231ea5d7c59 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 31 Mar 2008 17:35:45 -0400 Subject: [PATCH] Call client uninstall from server uninstall so that uninstall reverses also client bits. --- ipa-server/ipa-install/ipa-server-install | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install index 1be1d3c94..b8b020c70 100644 --- a/ipa-server/ipa-install/ipa-server-install +++ b/ipa-server/ipa-install/ipa-server-install @@ -292,6 +292,13 @@ def check_dirsrv(): sys.exit(1) def uninstall(): + try: + run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--uninstall"]) + except Exception, e: + print "Uninstall of client side components failed!" + print "ipa-client-install returned: " + str(e) + pass + ipaserver.ntpinstance.NTPInstance(fstore).uninstall() ipaserver.bindinstance.BindInstance(fstore).uninstall() ipaserver.httpinstance.WebGuiInstance().uninstall() @@ -324,6 +331,14 @@ def main(): fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore') if options.uninstall: + if not options.unattended: + print "\nThis is a NON REVERSIBLE operation and will delete all data and configuration!\n" + yesno = raw_input("Are you sure you want to continue with the uninstall proceedure?:[NO/yes] ") + if not yesno or yesno.lower() != "yes": + print "" + print "Aborting uninstall operation." + sys.exit(1) + return uninstall() print "=============================================================================="