Add support for detecting with cfengine is running under Xen.
ClosedPublic
Actions

Authored by skreuzer on Nov 21 2016, 8:02 PM.

Details

Reviewers

gjb
cy

Commits

rP428081: Add support for detecting when cfengine is running under Xen.

Summary

It appears that detection of Xen environments is broken on Linux and
also gets compiled out due to overzealous use of linux ifdefs when compiling
on FreeBSD. This revision addresses upstream bug CFE-2203 which can be found
at https://tracker.mender.io/browse/CFE-2203.

Test Plan

Build a new package of cfengine39 on an AWS EC2 instance running
FreeBSD-11 and make sure cf-promises --show-classes shows xen specific classes
being defined

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 6028
Build 6294: arc lint + arc unit

Event Timeline

skreuzer updated this revision to Diff 22414.Nov 21 2016, 8:02 PM

skreuzer retitled this revision from to Add support for detecting with cfengine is running under Xen..

skreuzer updated this object.

skreuzer edited the test plan for this revision. (Show Details)

skreuzer added reviewers: cy, gjb.

Herald added a subscriber: mat. · View Herald TranscriptNov 21 2016, 8:02 PM

One other thing to mention is that I do plan to attempting to submit these changes back upstream but getting patches accepted into cfengine is both slow and frustrating. For now I think it is easier to maintain these patches in the port and hope that at some point in the future I can remove them.

Also, just as a reference this is the environment I was testing on

root@ip-172-31-53-252:~ # uname -a
FreeBSD ip-172-31-53-252 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r297692: Fri Apr  8 03:07:13 UTC 2016     root@releng2.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
root@ip-172-31-53-252:~ # sysctl -n kern.vm_guest
xen
root@ip-172-31-53-252:~ # /usr/local/sbin/cf-promises --show-classes | grep -i xen
xen                                                          inventory,attribute_name=Virtual host,source=agent,hardclass
xen_domu_hv                                         source=agent,hardclass

I am likely not the best person to review this, but I see no issue with it. I would defer to Cy on this, but if you have submitted a change request upstream, you're probably ok to commit this.