From d0bdc37679ef6807d16f2f3b216366834f9d6de0 Mon Sep 17 00:00:00 2001 From: Gabe Date: Fri, 9 Oct 2015 11:02:06 -0600 Subject: [PATCH] Remove bind configuration detected question https://fedorahosted.org/freeipa/ticket/5351 Reviewed-By: Martin Basti --- ipaserver/install/bindinstance.py | 7 ------- ipaserver/install/dns.py | 4 ---- 2 files changed, 11 deletions(-) diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index e8fdb3b83..2790024b5 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -69,13 +69,6 @@ named_conf_include_re = re.compile(r'\s*include\s+"(?P)"\s*;') named_conf_include_template = "include \"%(path)s\";\n" -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) - - return True - def create_reverse(): return ipautil.user_input("Do you want to configure the reverse zone?", True) diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py index 486472094..1253b9bd0 100644 --- a/ipaserver/install/dns.py +++ b/ipaserver/install/dns.py @@ -146,10 +146,6 @@ def install_check(standalone, replica, options, hostname): False)): sys.exit("Aborted") - # Check bind packages are installed - if not bindinstance.check_inst(options.unattended): - sys.exit("Aborting installation.") - if options.disable_dnssec_master: _is_master()