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

[fix] Fix automation compatibility

Browse Source
This commit is contained in:
William Wernert
2021-01-04 14:46:48 -05:00
parent 7bfac1e8df
commit f94e421f4e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup/so-setup
View File

@@ -175,7 +175,7 @@ if ! [[ -f $install_opt_file ]]; then
echo "User cancelled setup." | tee -a "$setup_log" echo "User cancelled setup." | tee -a "$setup_log"
whiptail_cancel whiptail_cancel
fi fi
if [[ $setup_type == 'iso' ]]; then if [[ $setup_type == 'iso' ]] && [ "$automated" == no ]; then
whiptail_first_menu_iso whiptail_first_menu_iso
if [[ $option == "Configure Network" ]]; then if [[ $option == "Configure Network" ]]; then
network_init_whiptail network_init_whiptail
@@ -184,9 +184,7 @@ if ! [[ -f $install_opt_file ]]; then
printf '%s\n' \ printf '%s\n' \
"MNIC=$MNIC" \ "MNIC=$MNIC" \
"HOSTNAME=$HOSTNAME" > "$net_init_file" "HOSTNAME=$HOSTNAME" > "$net_init_file"
whiptail --title "Security Onion Setup" \ whiptail_net_setup_complete
--msgbox "Successfully set up networking, setup will now exit." 7 75
exit 0
else else
whiptail_install_type whiptail_install_type
fi fi

7
setup/so-whiptail
View File

@@ -794,6 +794,13 @@ whiptail_management_interface_setup() {
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus
} }
whiptail_net_setup_complete() {
[ -n "$TESTING" ] && return
whiptail --title "Security Onion Setup" \
--msgbox "Successfully set up networking, setup will now exit." 7 75
exit 0
}
whiptail_management_server() { whiptail_management_server() {