detect os and cloud sooner

This commit is contained in:
m0duspwnens
2021-01-25 10:25:41 -05:00
parent 560e510b44
commit e1f7c090f3

View File

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