When running in automated mode, cat all piped in input to setup log

This commit is contained in:
Jason Ertel
2020-07-20 20:26:35 -04:00
parent e881f4c92b
commit 3281467994
2 changed files with 6 additions and 9 deletions

View File

@@ -633,11 +633,6 @@ if [[ -n $SO_ERROR ]]; then
whiptail_setup_failed
else
echo "Successfully completed setup! Continuing with post-installation steps" >> $setup_log 2>&1
echo "automated=$automated" >> $setup_log 2>&1
echo "ALLOW_ROLE=$ALLOW_ROLE" >> $setup_log 2>&1
echo "ALLOW_CIDR=$ALLOW_CIDR" >> $setup_log 2>&1
echo "THEHIVE=$THEHIVE" >> $setup_log 2>&1
{
export percentage=95 # set to last percentage used in previous subshell
if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then

View File

@@ -1098,11 +1098,13 @@ whiptail_so_allow() {
whiptail_gauge_post_setup() {
[ -n "$TESTING" ] && return
local msg=$1
if [ -n "$TESTING" ]
cat >> $setup_log 2>&1
else
local msg=$1
whiptail --title "Security Onion Setup" --gauge "$msg" 6 60 96
whiptail --title "Security Onion Setup" --gauge "$msg" 6 60 96
fi
}
whiptail_strelka_rules() {