From 68422049816b0a361c348a3ce41be4b989358f98 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Thu, 11 Mar 2021 16:55:06 -0500 Subject: [PATCH] Ask for hostname earlier in setup --- setup/so-functions | 2 -- setup/so-setup | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index d4d1b4f96..fb5706ec4 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1758,7 +1758,6 @@ network_init() { network_init_whiptail() { case "$setup_type" in 'iso') - collect_hostname whiptail_management_nic whiptail_dhcp_or_static @@ -1772,7 +1771,6 @@ network_init_whiptail() { 'network') whiptail_network_notice whiptail_dhcp_warn - collect_hostname whiptail_management_nic ;; esac diff --git a/setup/so-setup b/setup/so-setup index 3fbb1d681..d7cbec540 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -204,6 +204,7 @@ if ! [[ -f $install_opt_file ]]; then if [[ $setup_type == 'iso' ]] && [ "$automated" == no ]; then whiptail_first_menu_iso if [[ $option == "CONFIGURENETWORK" ]]; then + collect_hostname network_init_whiptail whiptail_management_interface_setup network_init @@ -216,7 +217,8 @@ if ! [[ -f $install_opt_file ]]; then else true fi - fi + fi + collect_hostname whiptail_install_type else source $install_opt_file