|
 |
e3ffab |
From 788b0ac5d9ae805f46321d50531ed5baf80eee1e Mon Sep 17 00:00:00 2001
|
|
|
e3ffab |
From: David Kupka <dkupka@redhat.com>
|
|
|
e3ffab |
Date: Tue, 4 Nov 2014 03:22:59 -0500
|
|
|
e3ffab |
Subject: [PATCH] Stop dirsrv last in ipactl stop.
|
|
|
e3ffab |
|
|
|
e3ffab |
Other services may depend on directory server.
|
|
|
e3ffab |
|
|
|
e3ffab |
https://fedorahosted.org/freeipa/ticket/4632
|
|
|
e3ffab |
|
|
|
e3ffab |
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
|
|
|
e3ffab |
---
|
|
|
e3ffab |
install/tools/ipactl | 12 ++++++------
|
|
|
e3ffab |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
e3ffab |
|
|
|
e3ffab |
diff --git a/install/tools/ipactl b/install/tools/ipactl
|
|
|
e3ffab |
index 7a1e41b01a80eeea85c417399dcf4666f70d4b26..b1b0b6e26fa97cdc953c86eee22e160782b57379 100755
|
|
|
e3ffab |
--- a/install/tools/ipactl
|
|
|
e3ffab |
+++ b/install/tools/ipactl
|
|
|
e3ffab |
@@ -291,12 +291,6 @@ def ipa_stop(options):
|
|
|
e3ffab |
finally:
|
|
|
e3ffab |
raise IpactlError()
|
|
|
e3ffab |
|
|
|
e3ffab |
- try:
|
|
|
e3ffab |
- print "Stopping Directory Service"
|
|
|
e3ffab |
- dirsrv.stop(capture_output=False)
|
|
|
e3ffab |
- except:
|
|
|
e3ffab |
- raise IpactlError("Failed to stop Directory Service")
|
|
|
e3ffab |
-
|
|
|
e3ffab |
for svc in reversed(svc_list):
|
|
|
e3ffab |
svchandle = services.service(svc)
|
|
|
e3ffab |
try:
|
|
|
e3ffab |
@@ -305,6 +299,12 @@ def ipa_stop(options):
|
|
|
e3ffab |
except:
|
|
|
e3ffab |
emit_err("Failed to stop %s Service" % svc)
|
|
|
e3ffab |
|
|
|
e3ffab |
+ try:
|
|
|
e3ffab |
+ print "Stopping Directory Service"
|
|
|
e3ffab |
+ dirsrv.stop(capture_output=False)
|
|
|
e3ffab |
+ except:
|
|
|
e3ffab |
+ raise IpactlError("Failed to stop Directory Service")
|
|
|
e3ffab |
+
|
|
|
e3ffab |
# remove file with list of started services
|
|
|
e3ffab |
try:
|
|
|
e3ffab |
os.unlink(paths.SVC_LIST_FILE)
|
|
|
e3ffab |
--
|
|
|
e3ffab |
2.1.0
|
|
|
e3ffab |
|