From 92828d3cf50e00fe75ebf3ec9e0edc8b9c8eae35 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Wed, 1 Jul 2015 15:05:45 +0200 Subject: DNS: check if DNS package is installed Instead of separate checking of DNS required packages, we need just check if IPA DNS package is installed. https://fedorahosted.org/freeipa/ticket/4058 Reviewed-By: Martin Babinsky Reviewed-By: Petr Spacek Reviewed-By: Tomas Babej --- ipaserver/install/bindinstance.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'ipaserver/install/bindinstance.py') diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 2228342dc..9705e845a 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -62,25 +62,8 @@ named_conf_arg_options_template_nonstr = "%(indent)s%(name)s %(value)s;\n" named_conf_include_re = re.compile(r'\s*include\s+"(?P)"\s*;') named_conf_include_template = "include \"%(path)s\";\n" -def check_inst(unattended): - has_bind = True - named = services.knownservices.named - if not os.path.exists(named.get_binary_path()): - print "BIND was not found on this system" - print ("Please install the '%s' package and start the installation again" - % named.get_package_name()) - has_bind = False - - # Also check for the LDAP BIND plug-in - if not os.path.exists(paths.BIND_LDAP_SO) and \ - not os.path.exists(paths.BIND_LDAP_SO_64): - print "The BIND LDAP plug-in was not found on this system" - print "Please install the 'bind-dyndb-ldap' package and start the installation again" - has_bind = False - - if not has_bind: - return False +def check_inst(unattended): if not unattended and os.path.exists(NAMED_CONF): msg = "Existing BIND configuration detected, overwrite?" return ipautil.user_input(msg, False) -- cgit