From fc9df2bbaec84bc8d6a1d780074de4cd588f0019 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Fri, 9 Apr 2021 10:00:50 -0400 Subject: [PATCH] Update airgap question to ask during minion installs too --- setup/so-setup | 2 +- setup/so-whiptail | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/setup/so-setup b/setup/so-setup index 84fcf5c34..f53909bdc 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -264,7 +264,7 @@ elif [ "$install_type" = 'ANALYST' ]; then fi # Check if this is an airgap install -if [[ ( $is_manager || $is_import ) && $is_iso ]]; then +if [[ $is_iso || $is_minion ]]; then whiptail_airgap if [[ "$INTERWEBS" == 'AIRGAP' ]]; then is_airgap=true diff --git a/setup/so-whiptail b/setup/so-whiptail index 2b1199fb5..368b6b0cd 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -19,10 +19,13 @@ whiptail_airgap() { [ -n "$TESTING" ] && return + local node_str='node' + [[ $is_manager || $is_import ]] && node_str='manager' + INTERWEBS=$(whiptail --title "Security Onion Setup" --radiolist \ "Choose your install conditions:" 20 75 4 \ - "STANDARD" "This manager has internet accesss" ON \ - "AIRGAP" "This manager does not have internet access" OFF 3>&1 1>&2 2>&3 ) + "STANDARD" "This $node_str has internet accesss" ON \ + "AIRGAP" "This $node_str does not have internet access" OFF 3>&1 1>&2 2>&3 ) local exitstatus=$? whiptail_check_exitstatus $exitstatus