freebsd-update: create a ZFS boot environment on install if the system supports it
ClosedPublic
Actions

Authored by dave_fullard.ca on Oct 3 2019, 10:52 PM.

Details

Reviewers

cperciva
allanjude
emaste
kevans

Commits

rGf28f13890541: freebsd-update: create a ZFS boot environment on install

Summary

Updated freebsd-update to allow it to create boot environments using bectl
should the system support it. The bectl utility was updated in r352211 to
support a 'check' to determine if the system supports boot environments.
If the check fails, it will fall back to a manual method to discover if the
system is running ZFS and that root is mounted. If UFS is used, the bectl
check will fail then no attempt will be made to create the boot environment.
If freebsd-update is run inside a jail, no attempt will be made to create a
boot environment.

The boot environment function will create a new environment using the format:
current FreeBSD kernel version and date/timestamp, example:

12.0-RELEASE-p10_2019-10-03_185233

This functionality can be disabled by setting 'CreateBootEnv' in
freebsd-update.conf to 'no'.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

dave_fullard.ca created this revision.Oct 3 2019, 10:52 PM

Herald added a subscriber: imp. · View Herald TranscriptOct 3 2019, 10:52 PM

Harbormaster completed remote builds in B26855: Diff 62888.Oct 3 2019, 10:52 PM

allanjude added inline comments.Oct 3 2019, 11:05 PM

usr.sbin/freebsd-update/freebsd-update.sh
888	`kldstat -q -m zfs` will return 0 if ZFS is loaded, and 1 otherwise, without printing anything Your current code has the slightly beneficial side-effect of also matching openzfs.ko for those using the sysutils/openzfs port, but I imagine that was unintentional.

dave_fullard.ca added a child revision: D22052: Make freebsd-update ring terminal bell when waiting for user input.Oct 16 2019, 2:05 AM

dave_fullard.ca retitled this revision from Create a ZFS boot environment if the system supports it to freebsd-update: create a ZFS boot environment on install if the system supports it.Nov 15 2019, 12:00 AM

ping: Is there anything left for Dave to do here, or can we commit this?

kevans added inline comments.May 9 2020, 1:58 AM

usr.sbin/freebsd-update/freebsd-update.sh
888	I think we can just drop this entire case and commit it otherwise as-is, at this rate. `bectl check` made it into 12.1, and unfortunately this stalled out for too long for 11.4 to matter (though it has check as well), I think. If one gets to a point that they have this version of freebsd-update that knows about bectl, they should already have a bectl check installed.

In D21892#528400, @allanjude wrote:

ping: Is there anything left for Dave to do here, or can we commit this?

I'm going to go ahead and remove the referenced case and commit this tonightish.

In D21892#665591, @kevans wrote:

In D21892#528400, @allanjude wrote:

ping: Is there anything left for Dave to do here, or can we commit this?

I'm going to go ahead and remove the referenced case and commit this tonightish.