diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-05-11 16:49:43 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2011-05-12 15:18:25 +0200 |
| commit | 2b45be23e427040b667a1e705019354087149d14 (patch) | |
| tree | de18b50b574ab7e2bbd5f1d9c9a08d90362778d2 /install | |
| parent | e2aab9636e66e66edd72a3cdc9c29ff0033e7eaf (diff) | |
| download | freeipa-2b45be23e427040b667a1e705019354087149d14.tar.gz freeipa-2b45be23e427040b667a1e705019354087149d14.tar.xz freeipa-2b45be23e427040b667a1e705019354087149d14.zip | |
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
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-replica-install | 10 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 64f157742..49df7fef9 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 d50dc611b..00b133464 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: |