File 0001-Fix-extra-resources-SysInfo.in-This-calculation-of-c.patch of Package pacemaker.29834
From 69351640f19b9984fc50aedd3bafa53c53ce6552 Mon Sep 17 00:00:00 2001
From: liupei <liupei@kylinos.cn>
Date: Wed, 15 Mar 2023 17:12:54 +0800
Subject: [PATCH] Fix: extra/resources/SysInfo.in: This calculation of cpu_load
returns an incorrect value in Darwin and Linux
---
extra/resources/SysInfo.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: pacemaker-2.0.1+20190417.13d370ca9/extra/resources/SysInfo.in
===================================================================
--- pacemaker-2.0.1+20190417.13d370ca9.orig/extra/resources/SysInfo.in
+++ pacemaker-2.0.1+20190417.13d370ca9/extra/resources/SysInfo.in
@@ -159,7 +159,7 @@ SysInfoStats() {
cpu_type=`system_profiler SPHardwareDataType | awk -F': ' '/^CPU Type/ {print $2; exit}'`
cpu_speed=`system_profiler SPHardwareDataType | awk -F': ' '/^CPU Speed/ {print $2; exit}'`
cpu_cores=`system_profiler SPHardwareDataType | awk -F': ' '/^Number Of/ {print $2; exit}'`
- cpu_load=`uptime | awk '{ print $10 }'`
+ cpu_load=$(uptime | awk -F 'load average: ' '{ print $2 }' | awk -F ', ' '{ print $2 }')
;;
"FreeBSD")
cpu_type=`sysctl -in hw.model`
@@ -180,7 +180,7 @@ SysInfoStats() {
cpu_speed=`awk -F': ' '/bogomips/ {print $2; exit}' /proc/cpuinfo`
cpu_cores=`grep "^processor" /proc/cpuinfo | wc -l`
fi
- cpu_load=`uptime | awk '{ print $10 }'`
+ cpu_load=$(uptime | awk -F 'load average: ' '{ print $2 }' | awk -F ', ' '{ print $2 }')
if [ -f /proc/meminfo ]; then
# meminfo results are in kB