From 3f6baf25e24a667934502a3c929674fa831ece60 Mon Sep 17 00:00:00 2001 From: liweigang Date: Thu, 20 Jun 2024 15:51:55 +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 2f5480a..d41669f 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_mem="0$swap_mem" + fi swap_mem="${swap_mem}%" else swap_mem=0.0% diff --git a/generic-release.spec b/generic-release.spec index 8c9482c..8da4dd5 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,7 +5,7 @@ %define dist_release_version 8 %define generic_version 20.03 %define generic_patch_level LTS -%define generic_release 54 +%define generic_release 55 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -126,6 +126,9 @@ fi /usr/share/eula/eula.* %changelog +* Thu Jun 20 2024 liweigang - 1.0-55 +- modify swap_mem calculate results + * Tue May 28 2024 liyanan - 1.0-54 - Delete Processes print -- Gitee