From 9cd8260d8a96be2c54c834fcc4551b12bd71e699 Mon Sep 17 00:00:00 2001
From: gaochong <gaochong@uniontech.com>
Date: Thu, 1 Apr 2021 17:28:18 +0800
Subject: [PATCH] get memeroy info from /proc/meminfo instead of command free,
 fix issue I3EN1Z

Signed-off-by: gaochong <gaochong@uniontech.com>
(cherry picked from commit afd5eb7bafd0616a1c8fa02ea504fea888cb2e0e)
---
 generic-release-1.0/system-info.sh | 17 +++++++++++++----
 generic-release.spec               | 26 ++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh
index a4e9254..19af64a 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 c94ce99..0de3d77 100644
--- a/generic-release.spec
+++ b/generic-release.spec
@@ -5,8 +5,7 @@
 %define dist_release_version 8
 %define generic_version 20.03
 %define generic_patch_level LTS
-%define generic_patch_level_extend SP1
-%define generic_release 38
+%define generic_release 44
 %define builtin_release_version 1.0
 
 %define current_arch %{_arch}
@@ -137,8 +136,27 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/performance.sh
 
 %changelog
-* Mon Nov 25 2020 miao_kaibo <miaokaibo@huawei.com> - 1.0-38
-- change generic_patch_level and generic_release
+* Thu Apr  1 2021 gaochong <gaochong@uniontech.com> - 1.0-44
+- get memeroy info from /proc/meminfo instead of command free, fix issue I3EN1Z
+
+* Sat Dec 26 2020 fu_changjie <fuchangjie@kylinos.cn> - 1.0-43
+- Change value of product_family to 2, fix issue I3A6CP
+
+* Sat Dec 26 2020 fu_changjie <fuchangjie@kylinos.cn> - 1.0-42
+- Use generic_version macro instead of constant value， fix issue I28WC0
+
+* Sat Dec 26 2020 Shinwell_Hu <huxinwei@huawei.com> - 1.0-41
+- Disable GOMP_CPU_AFFINITY setting in performance.sh to fix issue I1OT20
+
+* Thu Aug 20 2020 co <colo9@outlook.com> - 1.0-40
+- fix bad date format in changelog 
+- /sbin/ip not found err fix
+
+* Thu Aug 6 2020 zhangrui <zhangrui182@huawei.com> - 1.0-39
+- modify system-info.sh to show more ip address when login
+
+* Fri Jun 19 2020 shenyangyang <shenyangyang4@huawei.com> - 1.0-38
+- change build requires of python to python3
 
 * Mon May 18 2020 shenyangyang <shenyangyang4@huawei.com> - 1.0-37
 - add equal sign in color.sh
-- 
Gitee