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

fernape requested review of this revision.Apr 15 2024, 12:20 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' ?

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

Drop cut(1) usage

fernape marked 2 inline comments as done.Apr 15 2024, 4:04 PM

Thanks!

This revision is now accepted and ready to land.Apr 15 2024, 4: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. 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

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...

This revision now requires review to proceed.Apr 16 2024, 4:28 PM

fernape marked an inline comment as done.Apr 16 2024, 4:28 PM