starlingx/tools
Code Issues Proposed changes

Merge "Changed str comparisons which mixed bash and posix"

Browse Source
This commit is contained in:
Zuul 2024-05-22 14:41:02 +00:00 committed by Gerrit Code Review
commit 41a5d3c0ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
import-stx
View File

@ -177,7 +177,7 @@ if [ "$STX_PLATFORM" = "minikube" ]; then
fi fi
FSTYPE=$(stat -f -L -c %T $MINIKUBE_HOME) FSTYPE=$(stat -f -L -c %T $MINIKUBE_HOME)
if [ x"$FSTYPE" == x"nfs" ]; then if [ x"$FSTYPE" = x"nfs" ]; then
echo "" echo ""
echo "Warning: stx minikube doesn't allow \$MINIKUBE_HOME or \$HOME directory as nfs mount point!!!" echo "Warning: stx minikube doesn't allow \$MINIKUBE_HOME or \$HOME directory as nfs mount point!!!"
echo " Please set non-nfs MINIKUBE_HOME with the command 'export MINIKUBE_HOME=XXX/YYY'" echo " Please set non-nfs MINIKUBE_HOME with the command 'export MINIKUBE_HOME=XXX/YYY'"
@ -194,7 +194,7 @@ if [ "$STX_PLATFORM" = "minikube" ]; then
NUM_USERS=$(sqrt $(number_of_users)) NUM_USERS=$(sqrt $(number_of_users))
ABSOLUTE_MAX_CPUS=$(($(number_of_cpus)/$NUM_USERS)) ABSOLUTE_MAX_CPUS=$(($(number_of_cpus)/$NUM_USERS))
MAX_CPUS=$(number_of_cpus) MAX_CPUS=$(number_of_cpus)
if [ "$MAX_CPUS" == "" ] || [ "$MAX_CPUS" == "0" ]; then if [ "$MAX_CPUS" = "" ] || [ "$MAX_CPUS" = "0" ]; then
MAX_CPUS=1 MAX_CPUS=1
fi fi
@ -210,7 +210,7 @@ if [ "$STX_PLATFORM" = "minikube" ]; then
fi fi
MAX_MEMORY=`expr $(cat /proc/meminfo |grep MemTotal | awk '{print $2}') / 1024` MAX_MEMORY=`expr $(cat /proc/meminfo |grep MemTotal | awk '{print $2}') / 1024`
if [ "$MAX_MEMORY" == "" ] || [ "$MAX_MEMORY" == "0" ]; then if [ "$MAX_MEMORY" = "" ] || [ "$MAX_MEMORY" = "0" ]; then
MAX_MEMORY=2048 MAX_MEMORY=2048
fi fi