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

[fix] Only show network init message if valid

Browse Source
This commit is contained in:
William Wernert
2020-12-09 09:59:44 -05:00
parent 950c05e53d
commit 51650147ef
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/so-setup
View File

@@ -257,7 +257,9 @@ if ! [ -f /root/install_opt ]; then
whiptail_management_server whiptail_management_server
fi fi
if [[ $is_minion || $is_iso ]]; then
whiptail_management_interface_setup whiptail_management_interface_setup
fi
if [[ "$setup_type" == 'iso' ]]; then if [[ "$setup_type" == 'iso' ]]; then
# Init networking so rest of install works # Init networking so rest of install works

15
setup/so-whiptail
View File

@@ -769,14 +769,23 @@ whiptail_management_interface_setup() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
local minion_msg local minion_msg
local msg
if [[ $is_minion || $is_import ]]; then if [[ $is_minion ]]; then
minion_msg=" and copy the ssh key for soremote to the manager" minion_msg="copy the ssh key for soremote to the manager"
else else
minion_msg="" minion_msg=""
fi fi
whiptail --title "Security Onion Setup" --yesno "Setup will now initialize networking$minion_msg. Select YES to continue or NO to cancel." 8 75 if [[ $is_iso ]]; then
if [[ $minion_msg != "" ]]; then
msg="initialize networking and $minion_msg"
else
msg="initialize networking"
fi
fi
whiptail --title "Security Onion Setup" --yesno "Setup will now $msg. Select YES to continue or NO to cancel." 8 75
local exitstatus=$? local exitstatus=$?
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus
} }