bsdinstall: Guard against invalid branch/revision
ClosedPublic
Actions

Authored by emaste on Jul 25 2025, 3:00 PM.

Details

Reviewers

ifreund_freebsdfoundation.org

Commits

rG00294d7b0a2e: bsdinstall: Guard against invalid branch/revision

Summary

I somehow ended up with a tree where make -V BRANCH and make -V REVISION
were broken, resulting in a FreeBSD-base.conf with a broken repo URL.
Check for BRANCH == RELEASE explicitly and emit a warning if BRANCH does
not match an expected case.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

emaste created this revision.Jul 25 2025, 3:00 PM

Herald added a subscriber: jrtc27. · View Herald TranscriptJul 25 2025, 3:00 PM

emaste requested review of this revision.Jul 25 2025, 3:00 PM

This LGTM!

I wonder if anything else breaks due to an invalid BRANCH. It looks like usr.sbin/pkg/Makefile silently ignores an invalid branch and falls back to latest. I'm not sure if this behavior is intentional or not though.

I'll make sure to update the duplication of this logic in https://reviews.freebsd.org/D51516, unfortunately I don't think there's a way to avoid the duplication without rewriting the vm image build scripts to use bsdinstall.

This revision is now accepted and ready to land.Jul 25 2025, 3:25 PM

Closed by commit rG00294d7b0a2e: bsdinstall: Guard against invalid branch/revision (authored by emaste). · Explain WhyJul 25 2025, 3:34 PM

This revision was automatically updated to reflect the committed changes.

emaste added a commit: rG00294d7b0a2e: bsdinstall: Guard against invalid branch/revision.

Herald added a subscriber: imp. · View Herald TranscriptJul 25 2025, 3:34 PM