kernel.
ClosedPublic
Actions

Authored by jhb on May 1 2015, 6:08 PM.

Details

Reviewers

emaste
gnn
adrian

Commits

rS282643: Use the kern.bootfile sysctl to set the default kernel path rather than

Summary

Use the kern.bootfile sysctl to set the default kernel path rather
than hardcoding /boot/kernel. This allows pmcstat(8) to work without
-k when using nextboot -k or 'boot foo' at the loader to boot alternate
kernels.

Test Plan

Boot a kernel not named /boot/kernel/kernel and verify pmcstat without -k outputs sensible symbols instead of bizarre ones.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jhb updated this revision to Diff 5143.May 1 2015, 6:08 PM

jhb retitled this revision from to Use kern.bootfile in pmcstat(8) rather than hardcoding /boot/kernel..

jhb updated this object.

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

jhb added reviewers: adrian, emaste, gnn.

Herald added a subscriber: imp. · View Herald TranscriptMay 1 2015, 6:08 PM

adrian accepted this revision.May 1 2015, 6:11 PM

adrian edited edge metadata.

This revision is now accepted and ready to land.May 1 2015, 6:11 PM

gnn accepted this revision.May 1 2015, 9:46 PM

gnn edited edge metadata.

emaste added inline comments.May 4 2015, 2:21 PM

usr.sbin/pmcstat/pmcstat.c
615 ↗	(On Diff #5143)	Minor point, should k still work even if kern.bootfile fails?

jhb added inline comments.May 6 2015, 4:08 PM

usr.sbin/pmcstat/pmcstat.c
615 ↗	(On Diff #5143)	I almost did that but decided against it. I don't think kern.bootfile can ever fail as it is always present. It can only fail if malloc() returns NULL perhaps (which I should check for). However, I do think there is the question of if the default should be kern.bootfile or /boot/kernel if -r is specified. I suspect it is probably just simpler to have it always be kern.bootfile though than to try to have it be too smart.