From 6487e6e1f06c8358aa0a09000bb42d67c9a3d987 Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Tue, 20 Dec 2022 10:44:37 -0500 Subject: [PATCH 1/3] remove old whiptail reference from so-setup --- setup/so-setup | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup/so-setup b/setup/so-setup index 01d45e6cd..d5f41edb1 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -272,7 +272,6 @@ if ! [[ -f $install_opt_file ]]; then whiptail_dhcp_warn whiptail_management_nic fi - #whiptail_network_init_notice # Initializing the network based on the previous information network_init printf '%s\n' \ @@ -287,7 +286,6 @@ if ! [[ -f $install_opt_file ]]; then if [[ $option == "CONFIGURENETWORK" ]]; then collect_hostname network_init_whiptail - #whiptail_network_init_notice network_init printf '%s\n' \ "MNIC=$MNIC" \ From 388e0a08aeb0e7717d34479a629c31ee941d405f Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Tue, 20 Dec 2022 10:45:30 -0500 Subject: [PATCH 2/3] remove old whiptail reference from so-functions --- setup/so-functions | 1 - 1 file changed, 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index c76cb6ba5..8989b9587 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1547,7 +1547,6 @@ networking_needful() { source "$net_init_file" fi if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then - #whiptail_network_init_notice network_init fi set_main_ip From 1371c4d01fc4f6028ead8473f23f6257016eef8e Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Tue, 20 Dec 2022 10:46:14 -0500 Subject: [PATCH 3/3] remove whiptail_network_init_notice from so-whiptail --- setup/so-whiptail | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/setup/so-whiptail b/setup/so-whiptail index 3eaf7fc68..de18d88ff 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -858,20 +858,6 @@ whiptail_net_setup_complete() { exit 0 } -whiptail_network_init_notice() { - [ -n "$TESTING" ] && return - - read -r -d '' message <<- EOM - Setup will now initialize networking. - - Select OK to continue. - EOM - - whiptail --title "$whiptail_title" --msgbox "$message" 9 75 - local exitstatus=$? - whiptail_check_exitstatus $exitstatus -} - whiptail_management_server() { [ -n "$TESTING" ] && return