twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-11-02 16:04:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Move order in entry file (#1078)

Browse Source
This commit is contained in:
Kroese 2025-10-17 13:04:03 +02:00 committed by GitHub
parent e1e5f8f91d
commit 175d90aad7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entry.sh
View File

@ -18,8 +18,8 @@ cd /run
. proc.sh # Initialize processor . proc.sh # Initialize processor
. serial.sh # Initialize serialport . serial.sh # Initialize serialport
. power.sh # Configure shutdown . power.sh # Configure shutdown
. config.sh # Configure arguments
. memory.sh # Check available memory . memory.sh # Check available memory
. config.sh # Configure arguments
. finish.sh # Finish initialization . finish.sh # Finish initialization
trap - ERR trap - ERR

10
src/memory.sh
View File

@ -2,7 +2,7 @@
set -Eeuo pipefail set -Eeuo pipefail
RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}') RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
if [[ "$RAM_CHECK" != [Nn]* && "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then if [[ "$RAM_CHECK" != [Nn]* && "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then
AVAIL_MEM=$(formatBytes "$RAM_AVAIL") AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
@ -59,15 +59,15 @@ if [[ "${RAM_SIZE,,}" == "max" ]]; then
RAM_WANTED=$(( RAM_WANTED / 1073741825 )) RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
if (( "$RAM_WANTED" < 1 )); then if (( "$RAM_WANTED" < 1 )); then
RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE )) RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE ))
RAM_WANTED=$(( RAM_WANTED / 1048577 )) RAM_WANTED=$(( RAM_WANTED / 1048577 ))
if (( "$RAM_WANTED" < 1 )); then if (( "$RAM_WANTED" < 1 )); then
RAM_WANTED=$(( RAM_AVAIL )) RAM_WANTED=$(( RAM_AVAIL ))
RAM_WANTED=$(( RAM_WANTED / 1048577 )) RAM_WANTED=$(( RAM_WANTED / 1048577 ))
fi fi
RAM_SIZE="${RAM_WANTED}M" RAM_SIZE="${RAM_WANTED}M"
@ -80,7 +80,7 @@ if [[ "${RAM_SIZE,,}" == "max" ]]; then
else else
RAM_SIZE="${RAM_WANTED}G" RAM_SIZE="${RAM_WANTED}G"
fi fi
fi fi
return 0 return 0