summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipaserver/install/cainstance.py3
-rw-r--r--ipaserver/install/dsinstance.py3
2 files changed, 6 insertions, 0 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 64175e48..56b84fcd 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -385,6 +385,9 @@ class CADSInstance(service.Service):
enabled = self.restore_state("enabled")
serverid = self.restore_state("serverid")
+ # Just eat this state if it exists
+ running = self.restore_state("running")
+
if not enabled is None and not enabled:
ipaservices.knownservices.dirsrv.disable()
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 9af5e584..827f6913 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -627,6 +627,9 @@ class DsInstance(service.Service):
enabled = self.restore_state("enabled")
+ # Just eat this state if it exists
+ running = self.restore_state("running")
+
try:
self.fstore.restore_file("/etc/security/limits.conf")
self.fstore.restore_file("/etc/sysconfig/dirsrv")