diff options
| author | Ana Krivokapic <akrivoka@redhat.com> | 2013-03-12 11:12:56 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-22 15:06:22 +0100 |
| commit | f68dd468c8028bca0a05ca314ce79b73fe6ffe08 (patch) | |
| tree | b4c16856bf3d83fd311751ebfdf53f064cc82292 | |
| parent | 9cb2c757a1527d03e39fb79fa7660bf9e935b7ba (diff) | |
| download | freeipa.git-f68dd468c8028bca0a05ca314ce79b73fe6ffe08.tar.gz freeipa.git-f68dd468c8028bca0a05ca314ce79b73fe6ffe08.tar.xz freeipa.git-f68dd468c8028bca0a05ca314ce79b73fe6ffe08.zip | |
Use default NETBIOS name in unattended ipa-adtrust-install
Unattended ipa-adtrust-install used to fail if --netbios option
was not provided. This patches fixes this, so that instead of
failing the default NETBIOS name is used.
https://fedorahosted.org/freeipa/ticket/3497
| -rwxr-xr-x | install/tools/ipa-adtrust-install | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index 00b64700..f2b482cc 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -172,7 +172,7 @@ def set_and_check_netbios_name(netbios_name, unattended): raise Exception('Unexpected state while checking NetBIOS domain name') if not adtrustinstance.check_netbios_name(netbios_name): - if unattended: + if unattended and not gen_netbios_name: netbios_name_error(netbios_name) sys.exit("Aborting installation.") else: @@ -183,6 +183,9 @@ def set_and_check_netbios_name(netbios_name, unattended): if not unattended and not netbios_name: netbios_name = read_netbios_name(gen_netbios_name) + if unattended and not netbios_name and gen_netbios_name: + netbios_name = gen_netbios_name + return (netbios_name, reset_netbios_name) def ensure_admin_kinit(admin_name, admin_password): |