Page MenuHomeFreeBSD
Differential D44797

freebsd-update(8): Use kern.module_path
ClosedPublic
Actions

Authored by fernape on Mon, Apr 15, 12:20 PM.
Tags
None
Referenced Files
F82546553: D44797.id137399.diff
Tue, Apr 30, 3:03 AM
Unknown Object (File)
Sat, Apr 27, 7:29 AM
Unknown Object (File)
Fri, Apr 26, 8:38 PM
Unknown Object (File)
Fri, Apr 26, 5:11 AM
Unknown Object (File)
Sun, Apr 21, 7:34 AM
Unknown Object (File)
Tue, Apr 16, 7:22 PM
Unknown Object (File)
Mon, Apr 15, 12:25 PM
Subscribers
imp
zlei

Details

Reviewers
kevans
zlei
Commits
rGd3b6d70e0dfa: freebsd-update(8): Use kern.module_path
Summary

Instead of tailored configuration files to look for module_path entries.

Reported by: kevans@

Test Plan

Just try freebsd-update fetch upgrade

(yes, without the -r so the process will abort after the information message)

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

fernape created this revision.Mon, Apr 15, 12:20 PM
Herald added a subscriber: imp. · View Herald TranscriptMon, Apr 15, 12:20 PM
fernape requested review of this revision.Mon, Apr 15, 12:20 PM
Harbormaster completed remote builds in B57107: Diff 137037.Mon, Apr 15, 12:21 PM
zlei added a subscriber: zlei.Mon, Apr 15, 2:58 PM
zlei added inline comments.
usr.sbin/freebsd-update/freebsd-update.sh
677

The following is from x86_64 QEMU VM:

# sysctl kern.module_path | cut -f2 -d\" | tr ";" "|"
/boot/kernel|/boot/modules|/boot/dtb|/boot/dtb/overlays

IIUC, 3rd party modules are not going to be installed into /boot/kernel . I'm not familiar with dtb parts, but I'd ask for confirmation if 3rd party modules will be installed into /boot/dtb or `/boot/dtb/overlays' ?

kevans added inline comments.Mon, Apr 15, 3:10 PM
usr.sbin/freebsd-update/freebsd-update.sh
677

Likely not, but if they are then the same caveat applies -- the kernel and dtb are generally pretty closely coupled, and there's some risk if you end up upgrading one without the other.

Also, the cut step of the pipe can go away; use sysctl -n kern.module_path to omit the sysctl name and just get the value

679–680
fernape updated this revision to Diff 137050.Mon, Apr 15, 3:58 PM

Drop cut(1) usage

Harbormaster completed remote builds in B57108: Diff 137050.Mon, Apr 15, 3:58 PM
fernape updated this revision to Diff 137051.Mon, Apr 15, 4:04 PM
  • Update comment
Harbormaster completed remote builds in B57109: Diff 137051.Mon, Apr 15, 4:04 PM
fernape marked 2 inline comments as done.Mon, Apr 15, 4:04 PM
kevans accepted this revision.Mon, Apr 15, 4:10 PM

Thanks!

This revision is now accepted and ready to land.Mon, Apr 15, 4:10 PM
zlei added inline comments.Mon, Apr 15, 4:31 PM
usr.sbin/freebsd-update/freebsd-update.sh
677

Likely not, but if they are then the same caveat applies -- the kernel and dtb are generally pretty closely coupled, and there's some risk if you end up upgrading one without the other.

Looks sane :)

Also, the cut step of the pipe can go away; use sysctl -n kern.module_path to omit the sysctl name and just get the value

imp added inline comments.Mon, Apr 15, 5:17 PM
usr.sbin/freebsd-update/freebsd-update.sh
679–680

Why? An empty sysctl is likely wrong, but loader.conf doesn't need any notion of a default because /boot/loader should always be passing it into the kernel for it to set it...

fernape updated this revision to Diff 137107.Tue, Apr 16, 4:28 PM
  • freebsd-update(8): Use kern.module_path
  • Address imp's comment.
This revision now requires review to proceed.Tue, Apr 16, 4:28 PM
Harbormaster completed remote builds in B57125: Diff 137107.Tue, Apr 16, 4:28 PM
fernape marked an inline comment as done.Tue, Apr 16, 4:28 PM
zlei added inline comments.Thu, Apr 18, 9:52 AM
usr.sbin/freebsd-update/freebsd-update.sh
680–682

An empty kern.module_path should not happen. So does it ( an empty kern.module_path ) deserve an informative message ? Just in case ...

fernape updated this revision to Diff 137300.Thu, Apr 18, 1:52 PM
  • Add warning message when kern.module_path is empty
Harbormaster completed remote builds in B57168: Diff 137300.Thu, Apr 18, 1:52 PM
fernape marked an inline comment as done.Thu, Apr 18, 1:53 PM
zlei accepted this revision.Thu, Apr 18, 2:36 PM

Looks good to me.

This revision is now accepted and ready to land.Thu, Apr 18, 2:36 PM
Closed by commit rGd3b6d70e0dfa: freebsd-update(8): Use kern.module_path (authored by fernape). · Explain WhyFri, Apr 19, 4:58 PM
This revision was automatically updated to reflect the committed changes.
fernape added a commit: rGd3b6d70e0dfa: freebsd-update(8): Use kern.module_path.
fernape added a comment.Fri, Apr 19, 4:58 PM

Thank you all for the review.

Revision Contents
Changeset List

PathSize
usr.sbin/
freebsd-update/
14 lines

Diff 137399

View Options

usr.sbin/freebsd-update/freebsd-update.sh

Loading...