From 09fd81cfb75056d4eb41e6a02fe25c52eb10f571 Mon Sep 17 00:00:00 2001 From: liweigang Date: Thu, 20 Jun 2024 15:46:50 +0800 Subject: [PATCH] fix swap_mem calculate results Signed-off-by: liweigang --- generic-release-1.0/system-info.sh | 4 ++++ generic-release.spec | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index d371529..da40cf5 100644 --- a/generic-release-1.0/system-info.sh +++ b/generic-release-1.0/system-info.sh @@ -34,6 +34,10 @@ fi if [ $swap_total -gt 0 ] then swap_mem=`echo "scale=1; ($swap_total - $swap_free) * 100.0 / $swap_total" |bc` + if [[ $swap_mem =~ ^\..*$ ]] + then + swap="0$swap_mem" + fi swap_mem="${swap_mem}%" else swap_mem=0.0% diff --git a/generic-release.spec b/generic-release.spec index 9e92096..8f6bf85 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -6,7 +6,7 @@ %define generic_version 22.03 %define generic_patch_level LTS %define generic_patch_level_extend SP4 -%define generic_release 57 +%define generic_release 58 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -127,6 +127,9 @@ fi /usr/share/eula/eula.* %changelog +* Thu Jun 20 2024 liweigang - 1.0-58 +- modify swap_mem calculate results + * Fri May 24 2024 wangchong - 1.0-57 - modify generic_patch_level_extend -- Gitee