diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index 58039d094584710825664b673fc88805679139cf..182368bb2b6a5acb7e0229c3639333a5b90839ab 100644 --- a/generic-release-1.0/system-info.sh +++ b/generic-release-1.0/system-info.sh @@ -13,19 +13,27 @@ welcome=$(uname -r) # Memory -memory_total=$(free -m | awk '/Mem:/ { printf($2)}') +memory_total=$(cat /proc/meminfo | awk '/^MemTotal:/ {printf($2)}') +memory_free=$(cat /proc/meminfo | awk '/^MemFree:/ { printf($2)}') +buffers=$(cat /proc/meminfo | awk '/^Buffers:/ { printf($2)}') +cached=$(cat /proc/meminfo | awk '/^Cached:/ { printf($2)}') +sreclaimable=$(cat /proc/meminfo | awk '/^SReclaimable:/ { printf($2)}') +swap_total=$(cat /proc/meminfo | awk '/^SwapTotal:/ { printf($2)}') +swap_free=$(cat /proc/meminfo | awk '/^SwapFree:/ { printf($2)}') + if [[ $memory_total -gt 0 ]] then - memory_usage=$(free -m | awk '/Mem:/ { printf("%3.1f%%", $3/$2*100)}') + memory_usage=`echo "scale=1; ($memory_total - $memory_free - $buffers - $cached - $sreclaimable) * 100.0 / $memory_total" |bc` + memory_usage="${memory_usage}%" else memory_usage=0.0% fi # Swap memory -swap_total=$(free -m | awk '/Swap:/ { printf($2)}') if [[ $swap_total -gt 0 ]] then - swap_mem=$(free -m | awk '/Swap:/ { printf("%3.1f%%", $3/$2*100)}') + swap_mem=`echo "scale=1; ($swap_total - $swap_free) * 100.0 / $swap_total" |bc` + swap_mem="${swap_mem}%" else swap_mem=0.0% fi diff --git a/generic-release.spec b/generic-release.spec index cb6c452ca21cf3944d57d61ad8c119b37124efd4..d0f55b3afb9ca218ebb75a596158426ee0fc151a 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -6,7 +6,7 @@ %define generic_version 20.03 %define generic_patch_level LTS %define generic_patch_level_extend SP1 -%define generic_release 46 +%define generic_release 47 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog +* Tue Dec 21 2021 gaochong - 1.0-47 +- get memeroy info from /proc/meminfo instead of command free + * Wed Dec 01 2021 yaokai - 1.0-46 - Fix syntax error