From 25d5d7ed939384340c0aa7d00989cbddf4226bcd Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 10 Oct 2011 15:25:15 +0300 Subject: Add support for systemd environments and use it to support Fedora 16 https://fedorahosted.org/freeipa/ticket/1192 --- ipaserver/install/dsinstance.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipaserver/install/dsinstance.py') diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index f2b16dfe..995877c1 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -107,8 +107,8 @@ def check_ports(): ds_secure = installutils.port_available(636) return (ds_unsecure, ds_secure) -def is_ds_running(): - return ipaservices.knownservices.dirsrv.is_running() +def is_ds_running(server_id=''): + return ipaservices.knownservices.dirsrv.is_running(instance_name=server_id) def has_managed_entries(host_name, dm_password): """Check to see if the Managed Entries plugin is available""" @@ -413,7 +413,7 @@ class DsInstance(service.Service): def restart(self, instance=''): try: super(DsInstance, self).restart(instance) - if not is_ds_running(): + if not is_ds_running(instance): logging.critical("Failed to restart the directory server. See the installation log for details.") sys.exit(1) installutils.wait_for_open_ports('localhost', self.open_ports, 300) -- cgit