From 55911ef64918c49a05fa06ffe3e9c9c8c8dace8d Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 11 Jan 2023 11:05:01 -0500 Subject: [PATCH] Fix reinstall logic --- SECURITY.md | 3 ++- setup/so-setup | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 46ae8090c..771d087a1 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,7 +4,8 @@ | Version | Supported | | ------- | ------------------ | -| 2.x.x | :white_check_mark: | +| 2.4.x | :white_check_mark: | +| 2.3.x | :white_check_mark: | | 16.04.x | :x: | Security Onion 16.04 has reached End Of Life and is no longer supported. diff --git a/setup/so-setup b/setup/so-setup index ab6f4f491..cb4d8475d 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -318,7 +318,9 @@ if ! [[ -f $install_opt_file ]]; then check_requirements "manager" networking_needful collect_dockernet - whiptail_airgap + if [[ $is_iso ]]; then + whiptail_airgap + fi detect_cloud set_minion_info set_default_log_size >> $setup_log 2>&1 @@ -338,7 +340,9 @@ if ! [[ -f $install_opt_file ]]; then check_requirements "manager" networking_needful collect_dockernet - whiptail_airgap + if [[ $is_iso ]]; then + whiptail_airgap + fi detect_cloud set_minion_info set_default_log_size >> $setup_log 2>&1 @@ -357,7 +361,9 @@ if ! [[ -f $install_opt_file ]]; then check_requirements "manager" networking_needful collect_dockernet - whiptail_airgap + if [[ $is_iso ]]; then + whiptail_airgap + fi detect_cloud set_default_log_size >> $setup_log 2>&1 info "Verifying all network devices are managed by Network Manager that should be" @@ -374,7 +380,9 @@ if ! [[ -f $install_opt_file ]]; then check_requirements "manager" networking_needful collect_dockernet - whiptail_airgap + if [[ $is_iso ]]; then + whiptail_airgap + fi detect_cloud set_default_log_size >> $setup_log 2>&1 info "Verifying all network devices are managed by Network Manager that should be" @@ -436,7 +444,9 @@ if ! [[ -f $install_opt_file ]]; then check_elastic_license check_requirements "import" networking_needful - whiptail_airgap + if [[ $is_iso ]]; then + whiptail_airgap + fi detect_cloud set_minion_info set_default_log_size >> $setup_log 2>&1 @@ -459,6 +469,7 @@ if ! [[ -f $install_opt_file ]]; then fi if [[ $waitforstate ]]; then + touch /root/accept_changes percentage=0 es_heapsize ls_heapsize @@ -579,6 +590,7 @@ if ! [[ -f $install_opt_file ]]; then set_initial_firewall_access whiptail_setup_complete else + touch /root/accept_changes es_heapsize ls_heapsize generate_interface_vars