diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index 9a585ded16fae8617dc3ed3ecea2aded538239ce..49269ed25a64913340e6285e68c13ec450a4fc98 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 3064cc5381a3008ca72b60e33e520b3c32a74d02..847500545ca2e0e6a77c6b15fddc6568309e9cdf 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -4,7 +4,7 @@ %define variant_lowercase server %define dist_release_version 8 %define generic_version 21.09 -%define generic_release 49 +%define generic_release 50 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -27,7 +27,7 @@ Source2: 90-default.preset Source3: 99-default-disable.preset BuildRequires: python3 -Requires: %{product_family}-repos +Requires: %{product_family}-repos bc Obsoletes: yum-utils yum-utils-help yum-utils-plugins %description @@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog +* Mon Nov 29 2021 yaokai - 1.0.50 +- recover the dependency for bc + * Mon Nov 22 2021 miao_kaibo - 1.0-49 - delete dependency bc