mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-10 11:12:51 +01:00
Merge pull request #9439 from Security-Onion-Solutions/2.4/remove-old-whiptail
Remove whiptail_network_init_notice
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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" \
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user