-
Notifications
You must be signed in to change notification settings - Fork 497
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.
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
(FACT-1883) Fix compilation on platforms without utmpx #1750
Conversation
Can one of the admins verify this patch? |
Hi @buzzdeee, thanks for this patch! It looks like the right fix to me, there are just a couple of minor things:
If you're not particularly familiar with git, I can help you with making those changes. |
CLA signed by all contributors. |
On systems, that don't have utmpx.h, i.e. OpenBSD, don't use it. Looking at utmpx for the uptime resolver was introduced in 3.11.4, but the fallback to just run the uptime command is still there. So if no utmpx is around, only run the uptime command.
Hi @branan , I just commit --amend the patch, and push -f cheers, |
Hi @buzzdeee! Sorry for this being ignored for so long. If you still want this merged, please rebase the commit on 3.11.x, to have it get into puppet5 as well. Otherwise, this looks good to me. |
jenkins please test this on debian8-64a,debian8-32a,debian9-64a,debian9-32a,fedora28-64a,fedora29-64a,redhat5-64a,centos6-64a,centos6-32a,redhat7-64a,redhat8-64a,redhatfips7-64a,sles11-64a,sles11-32a,sles12-64a,sles15-64a,ubuntu1404-64a,ubuntu1404-32a,ubuntu1604-64a,ubuntu1604-32a,ubuntu1804-64a |
Hi @GabrielNagy not sure what you mean with: OpenBSD recent snapshot has Puppet 5.5.14, and facter 3.14.0. What's this failing acceptance test, I don't seem to be able to see what's going wrong there. cheers, |
That's understandable, since this was a bug fix of sorts I thought you may have wanted to merge it to the older facter versions as well. We'll merge this to master then 👍. Acceptance tests failing are not related, because this change only impacts the build process the Travis checks should suffice. |
On systems, that don't have utmpx.h, i.e. OpenBSD, don't use it.
Looking at utmpx for the uptime resolver was introduced
in 3.11.4, but the fallback to just run the uptime command
is still there. So if no utmpx is around, only run the
uptime command.