[fix] Fix automation compatibility

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

View File

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

View File

@@ -794,6 +794,13 @@ whiptail_management_interface_setup() {
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() {