Skip to content

Define the "suse" class on SLED systems (3.24.x) #5820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olehermanse merged 2 commits into from
Jun 3, 2025
Merged

Define the "suse" class on SLED systems (3.24.x) #5820

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
411c1e8
sysinfo.c: Removed trailing whitespace
larsewi May 30, 2025
e28fa7d
Define suse class on SLED systems
amousset Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions libenv/sysinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,8 +1182,9 @@ static void OSReleaseParse(EvalContext *ctx, const char *file_path)
{
alias = "redhat";
}
else if (StringEqual(os_release_id, "opensuse") ||
StringEqual(os_release_id, "sles"))
else if (StringEqual(os_release_id, "opensuse") ||
StringEqual(os_release_id, "sles") ||
StringEqual(os_release_id, "sled"))
{
alias = "suse";
}
Expand Down Expand Up @@ -3540,13 +3541,13 @@ static void SysOSNameHuman(EvalContext *ctx)

/**
* Find next integer from string in place. Leading zero's are included.
*
*
* @param [in] str string to extract next integer from
* @param [out] num pointer to start of next integer or %NULL if no integer
* number was found
*
*
* @return pointer to the remaining string in `str` or %NULL if no remainder
*
*
* @note `str` will be mutated
*/
static char *FindNextInteger(char *str, char **num)
Expand Down Expand Up @@ -3614,8 +3615,8 @@ static void SysOsVersionMajor(EvalContext *ctx)
}
else
{
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS,
"os_version_major", major,
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS,
"os_version_major", major,
CF_DATA_TYPE_STRING,
"source=agent,derived-from=flavor");
}
Expand Down
Loading