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

[fix] Don't set startup state until end of setup

Browse Source
This commit is contained in:
William Wernert
2020-04-28 13:02:27 -04:00
parent 7a456c2c6b
commit e6492d4852
3 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
setup/so-setup
View File

@@ -257,6 +257,9 @@ if [[ $is_minion ]]; then
fi
# Begin install
# Set initial percentage to 0
export percentage=0
{
if [[ $is_sensor || $is_helix ]]; then
@@ -321,8 +324,8 @@ fi
node_pillar 2>> "$setup_log"
fi
set_progress_str 20 'Generating CA'
gen_ca 2>> "$setup_log"
set_progress_str 20 'Generating CA and checking in'
salt_checkin 2>> "$setup_log"
if [[ $is_master || $is_helix ]]; then
set_progress_str 25 'Downloading containers from the internet'
@@ -428,7 +431,13 @@ fi
filter_unused_nics 2>> "$setup_log"
network_setup 2>> "$setup_log"
set_progress_str 91 'Verifying setup'
set_progress_str 91 'Enabling checkin at boot'
checkin_at_boot 2>> "$setup_log"
set_progress_str 92 'Updating packages'
update_packages 2>> "$setup_log"
set_progress_str 93 'Verifying setup'
salt-call -l info state.highstate >> $setup_log 2>&1
} | whiptail --title "Hybrid Hunter Install" --gauge "Please wait while installing" 6 60 0