From c2034805d323dcf505042d03dbd801561aa64ed3 Mon Sep 17 00:00:00 2001 From: Ana Krivokapic Date: Tue, 12 Mar 2013 11:12:56 -0400 Subject: 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 --- install/tools/ipa-adtrust-install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'install/tools/ipa-adtrust-install') diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index ea8d4e467..5744c6f67 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -170,7 +170,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: @@ -181,6 +181,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): -- cgit