CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-10 11:12:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9439 from Security-Onion-Solutions/2.4/remove-old-whiptail

Browse Source 
Remove whiptail_network_init_notice
This commit is contained in:
Doug Burks
2022-12-20 11:16:24 -05:00
committed by GitHub
parent d4c54ce161 1371c4d01f
commit 03f682dbec
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
setup/so-functions
View File

@@ -1547,7 +1547,6 @@ networking_needful() {
source "$net_init_file" source "$net_init_file"
fi fi
if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then
#whiptail_network_init_notice
network_init network_init
fi fi
set_main_ip set_main_ip

2
setup/so-setup
View File

@@ -272,7 +272,6 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_dhcp_warn whiptail_dhcp_warn
whiptail_management_nic whiptail_management_nic
fi fi
#whiptail_network_init_notice
# Initializing the network based on the previous information # Initializing the network based on the previous information
network_init network_init
printf '%s\n' \ printf '%s\n' \
@@ -287,7 +286,6 @@ if ! [[ -f $install_opt_file ]]; then
if [[ $option == "CONFIGURENETWORK" ]]; then if [[ $option == "CONFIGURENETWORK" ]]; then
collect_hostname collect_hostname
network_init_whiptail network_init_whiptail
#whiptail_network_init_notice
network_init network_init
printf '%s\n' \ printf '%s\n' \
"MNIC=$MNIC" \ "MNIC=$MNIC" \

14
setup/so-whiptail
View File

@@ -858,20 +858,6 @@ whiptail_net_setup_complete() {
exit 0 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() { whiptail_management_server() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return