From 2b45be23e427040b667a1e705019354087149d14 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 11 May 2011 16:49:43 -0400 Subject: Properly handle --no-reverse being passed on the CLI in interactive mode If installing in interactive mode and --no-reverse is passed then the reverse zone was still being created. ticket 1152 --- install/tools/ipa-replica-install | 10 +++++++--- install/tools/ipa-server-install | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'install') diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 64f15774..49df7fef 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -290,9 +290,13 @@ def install_bind(config, options): if options.unattended: # In unattended mode just use the cmdline flag create_reverse = not options.no_reverse - elif not options.no_reverse: - # In interactive mode, if the flag was not explicitly specified, ask the user - create_reverse = bindinstance.create_reverse() + else: + if options.no_reverse: + create_reverse = False + else: + # In interactive mode, if the flag was not explicitly + # specified, ask the user + create_reverse = bindinstance.create_reverse() bind.setup(config.host_name, ip_address, config.realm_name, config.domain_name, forwarders, options.conf_ntp, create_reverse) diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index d50dc611..00b13346 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -908,9 +908,13 @@ def main(): if options.unattended: # In unattended mode just use the cmdline flag create_reverse = not options.no_reverse - elif not options.no_reverse: - # In interactive mode, if the flag was not explicitly specified, ask the user - create_reverse = bindinstance.create_reverse() + else: + if options.no_reverse: + create_reverse = False + else: + # In interactive mode, if the flag was not explicitly + # specified, ask the user + create_reverse = bindinstance.create_reverse() bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders, options.conf_ntp, create_reverse, zonemgr=options.zonemgr) if options.setup_dns: -- cgit