diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index 6bfdbed6241e0c424dd5988ef62c35d30d451075..7231016b6437dbb84483bbff8e0e56915b07b2c2 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 f649e42f975748446d5b029e34f76d0755fdd5f1..727383e41e5e280f6a0c2b090e4cc007e22f4d4a 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -3,8 +3,9 @@ %define variant_titlecase Server %define variant_lowercase server %define dist_release_version 8 -%define generic_version 20.09 -%define generic_release 43 +%define generic_version 20.03 +%define generic_patch_level LTS +%define generic_release 44 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -135,8 +136,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog -* Thu Sep 03 2020 jiangchuangang - 1.0-43 -- remove unnecessary information +* Thu Apr 1 2021 gaochong - 1.0-44 +- get memeroy info from /proc/meminfo instead of command free, fix issue I3EN1Z + +* Sat Dec 26 2020 fu_changjie - 1.0-43 +- Change value of product_family to 2, fix issue I3A6CP * Wed Sep 02 2020 zhangrui - 1.0-42 - remove LTS from VERSION in os-release