diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index 9f9f7e3d2f1a6f7237dec37dcdb877a1cfc5da83..4ee99a405a992f199acb0eb83de47a96f3ccd36f 100644 --- a/generic-release-1.0/system-info.sh +++ b/generic-release-1.0/system-info.sh @@ -13,19 +13,28 @@ 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 08e556f3f9267d062f820fec28171368bf5a7b58..489fcd36a0dfba3a7f0c1523adaf78127f639f51 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -3,7 +3,8 @@ %define variant_titlecase Server %define variant_lowercase server %define dist_release_version 8 -%define generic_version 21.03 +%define generic_version 20.03 +%define generic_patch_level LTS %define generic_release 44 %define builtin_release_version 1.0 @@ -135,11 +136,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog -* Fri Mar 05 2021 miao_kaibo - 1.0-44 -- bug fix product_family value +* Thu Apr 1 2021 gaochong - 1.0-44 +- get memeroy info from /proc/meminfo instead of command free, fix issue I3EN1Z -* Sun Feb 07 2021 miao_kaibo - 1.0-43 -- change generic_version from 20.03 to 21.03 and delete generic_patch_level +* Sat Dec 26 2020 fu_changjie - 1.0-43 +- Change value of product_family to 2, fix issue I3A6CP * Sat Dec 26 2020 fu_changjie - 1.0-42 - Use generic_version macro instead of constant value, fix issue I28WC0