libenv/sysinfo: Fix detected os description #5751
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use platform context variable also for logging the os class description. Before this change, it were using loop counter variable, which is incremented again. This led to verbose logging message: verbose: CFEngine detected operating system description is qnx on Darwin/macOS. Also use already lowercased sysname from utsname struct. Fixes: e2c9f00 ("Use a proper 'bool' variable for a condition in GetNameInfo3()")
Co-authored-by: Lars Erik Wik <53906608+larsewi@users.noreply.github.com>
craigcomstock
approved these changes
Apr 1, 2025
Contributor
craigcomstock
left a comment
craigcomstock
left a comment
There was a problem hiding this comment.
seems reasonable. :) thanks!
Member
|
@cf-bottom jenkins, please |
|
Sure, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/11973/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-11973/ |
larsewi
added a commit
to larsewi/core
that referenced
this pull request
Apr 29, 2025
In commit 22ad5d6 an assumption was made that the `sysname` attribute of `struct utsname` is always lower case. This assumption proved to be wrong for Windows Server 2019. Since the commit also contains other changes, I will do a manual revert. See cfengine#5751 for more information. Ticket: CFE-4519 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use platform context variable also for logging the os class description. Before this change, it were using loop counter variable, which is incremented again. This led to verbose logging message:
verbose: CFEngine detected operating system description is qnx
on Darwin/macOS.
Also use already lowercased sysname from utsname struct.
Fixes: e2c9f00 ("Use a proper 'bool' variable for a condition in GetNameInfo3()")