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

detect os and cloud sooner

Browse Source
This commit is contained in:
m0duspwnens
2021-01-25 10:25:41 -05:00
parent 560e510b44
commit e1f7c090f3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/so-setup
View File

@@ -104,6 +104,8 @@ function progress() {
fi fi
} }
detect_os && detect_cloud
if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then
echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1 echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1
source automation/$automation source automation/$automation
@@ -152,7 +154,6 @@ set_ssh_cmds $automated
local_sbin="$(pwd)/../salt/common/tools/sbin" local_sbin="$(pwd)/../salt/common/tools/sbin"
export PATH=$PATH:$local_sbin export PATH=$PATH:$local_sbin
detect_os && detect_cloud
set_network_dev_status_list set_network_dev_status_list
if [ "$OS" == ubuntu ]; then if [ "$OS" == ubuntu ]; then