diff options
author | Alexander Bokovoy <abokovoy@redhat.com> | 2011-10-10 15:25:15 +0300 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2011-10-24 15:10:11 +0200 |
commit | 25d5d7ed939384340c0aa7d00989cbddf4226bcd (patch) | |
tree | 3f738da9e1603b5577e1fb2a644b8a3c9a189162 /ipaserver/install/dsinstance.py | |
parent | f098b213eb3d2e8e5d47689a226f81a0d1b35262 (diff) | |
download | freeipa-25d5d7ed939384340c0aa7d00989cbddf4226bcd.tar.gz freeipa-25d5d7ed939384340c0aa7d00989cbddf4226bcd.tar.xz freeipa-25d5d7ed939384340c0aa7d00989cbddf4226bcd.zip |
Add support for systemd environments and use it to support Fedora 16
https://fedorahosted.org/freeipa/ticket/1192
Diffstat (limited to 'ipaserver/install/dsinstance.py')
-rw-r--r-- | ipaserver/install/dsinstance.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index f2b16dfe8..995877c11 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) |