diff --git a/setup/so-functions b/setup/so-functions index 94caeba19..a35393ddf 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -398,7 +398,7 @@ checkin_at_boot() { } check_requirements() { - local eval_or_dist=$1 + local standalone_or_dist=$1 local node_type=$2 # optional local req_mem local req_cores @@ -407,12 +407,12 @@ check_requirements() { readarray -t nic_list <<< "$(ip link| awk -F: '$0 !~ "lo|vir|veth|br|docker|wl|^[^0-9]"{print $2}' | grep -vwe "bond0" | sed 's/ //g')" local num_nics=${#nic_list[@]} - if [[ "$eval_or_dist" == 'eval' ]]; then + if [[ "$standalone_or_dist" == 'standalone' ]]; then req_mem=12 req_cores=4 req_nics=2 req_storage=100 - elif [[ "$eval_or_dist" == 'dist' ]]; then + elif [[ "$standalone_or_dist" == 'dist' ]]; then req_mem=8 req_cores=4 req_storage=40 diff --git a/setup/so-setup b/setup/so-setup index 0f28f1244..d9bc73d27 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -163,8 +163,8 @@ elif [ "$install_type" = 'HELIXSENSOR' ]; then is_helix=true fi -if [[ $is_eval ]]; then - check_requirements "eval" +if [[ $is_master && $is_sensor ]]; then + check_requirements "standalone" elif [[ $is_fleet_standalone ]]; then check_requirements "dist" "fleet" elif [[ $is_sensor && ! $is_eval ]]; then