Merge ~spencerrunde/ubuntu/+source/landscape-client:lp2066983-fix-cores-variable-in-motd-jammy into ubuntu/+source/landscape-client:ubuntu/jammy-devel

Proposed by Spencer Runde
Status: Needs review
Proposed branch: ~spencerrunde/ubuntu/+source/landscape-client:lp2066983-fix-cores-variable-in-motd-jammy
Merge into: ubuntu/+source/landscape-client:ubuntu/jammy-devel
Diff against target: 28 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/landscape-sysinfo.wrapper (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
git-ubuntu import Pending
Review via email: mp+466526@code.launchpad.net

Commit message

d/landscape-sysinfo.wrapper: fix 'cores' variable to CORES (LP: #2066983)

Description of the change

Fix a misnamed variable that affects the calculation of the load threshold to display system info in the message of the day.

To post a comment you must log in.

Unmerged commits

1c57766... by Spencer Runde

d/changelog: release 23.02-0ubuntu2~22.04.2 for jammy

4f4edca... by Spencer Runde

d/landscape-sysinfo.wrapper: fix 'cores' variable to CORES (LP: #2066983)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index ae37bf8..e0d2742 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+landscape-client (23.02-0ubuntu2~22.04.2) jammy; urgency=medium
7+
8+ * d/landscape-sysinfo.wrapper: fix 'cores' variable to CORES in message-
9+ of-the-day load threshold calculation (LP: #2066983)
10+
11+ -- Spencer Runde <spencer.runde@canonical.com> Tue, May 28 2024 14:19:00 -0500
12+
13 landscape-client (23.02-0ubuntu1~22.04.2) jammy; urgency=medium
14
15 * d/p/0001-start-service-during-config.patch: fix landscape-config does not
16diff --git a/debian/landscape-sysinfo.wrapper b/debian/landscape-sysinfo.wrapper
17index 4460113..283322f 100644
18--- a/debian/landscape-sysinfo.wrapper
19+++ b/debian/landscape-sysinfo.wrapper
20@@ -19,7 +19,7 @@ else
21 export LANG
22 CORES=$(grep -c ^processor /proc/cpuinfo 2>/dev/null)
23 [ "$CORES" -eq "0" ] && CORES=1
24- THRESHOLD="${cores:-1}.0"
25+ THRESHOLD="${CORES:-1}.0"
26
27 if [ $(echo "`cut -f1 -d ' ' /proc/loadavg` < $THRESHOLD" | bc) -eq 1 ]; then
28 SYSINFO=$(printf "\n System information as of %s\n\n%s\n" \

Subscribers

People subscribed via source and target branches