Skip to content

Manjaro Linux OS proper identification#5807

Merged
olehermanse merged 1 commit into
cfengine:masterfrom
m-bouissou:Manjaro_OS
May 28, 2025
Merged

Manjaro Linux OS proper identification#5807
olehermanse merged 1 commit into
cfengine:masterfrom
m-bouissou:Manjaro_OS

Conversation

@m-bouissou

@m-bouissou m-bouissou commented May 16, 2025 •
edited by craigcomstock
Loading

Copy link
Copy Markdown
Contributor

A couple patches for allowing CFEngine to properly identify Manjaro Linux (ArchLinux family) systems.

@CLAassistant

CLAassistant commented May 16, 2025 •
edited
Loading

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

larsewi
larsewi requested changes May 22, 2025
View reviewed changes

@larsewi larsewi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 🚀 Only one minor comment. Otherwise it looks good :)

Comment thread libenv/sysinfo.c Outdated
@olehermanse

olehermanse commented May 23, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

@m-bouissou Thanks for adjusting the code, could you squash your commits, so we get a nicer commit history? (Otherwise, this looks ready to merge)

@m-bouissou

m-bouissou commented May 24, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Squashed as requested.

@m-bouissou
Manjaro Linux proper identification
e70da53 
Co-authored-by: Lars Erik Wik <53906608+larsewi@users.noreply.github.com>
larsewi
larsewi approved these changes May 27, 2025
View reviewed changes

@larsewi larsewi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 🚀

@larsewi

larsewi commented May 28, 2025

Copy link
Copy Markdown
Contributor

@cf-bottom Jenkins please :)

@cf-bottom

cf-bottom commented May 28, 2025

Copy link
Copy Markdown

Sure, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12160/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12160/

@craigcomstock

craigcomstock commented May 28, 2025

Copy link
Copy Markdown
Contributor

we had a hiccup in jenkins, @cf-bottom retry the build please, thanks.

@cf-bottom

cf-bottom commented May 28, 2025

Copy link
Copy Markdown

Sure, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12169/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12169/

@craigcomstock

craigcomstock commented May 28, 2025

Copy link
Copy Markdown
Contributor

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12170/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12170/

@olehermanse olehermanse added the cherry-pick? Fixes which may need to be cherry-picked to LTS branches label May 28, 2025
@olehermanse olehermanse merged commit e2a636a into cfengine:master May 28, 2025
12 checks passed
@larsewi larsewi mentioned this pull request May 30, 2025
Merged
@larsewi

larsewi commented May 30, 2025

Copy link
Copy Markdown
Contributor

Back-ported to 3.24.x

@m-bouissou m-bouissou mentioned this pull request Jun 2, 2025
Merged
@aleksandrychev aleksandrychev removed the cherry-pick? Fixes which may need to be cherry-picked to LTS branches label Nov 4, 2025
@aleksandrychev

aleksandrychev commented Nov 4, 2025

Copy link
Copy Markdown
Contributor

Back-ported to 3.24.x

cherry-pick label removed, because it already backported

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickanderson nickanderson nickanderson approved these changes
@olehermanse olehermanse olehermanse approved these changes
@larsewi larsewi larsewi approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@m-bouissou @CLAassistant @olehermanse @larsewi @cf-bottom @craigcomstock @aleksandrychev @nickanderson