@ifreund_freebsdfoundation.org: i'd appreciate a review on this one just to check that the existence of "FreeBSD-kernel-man" package doesn't confuse the pkgbase installer, since it looks a bit like it's a kernel package (but it's not).

In D51504#1176453, @ivy wrote:

@ifreund_freebsdfoundation.org: i'd appreciate a review on this one just to check that the existence of "FreeBSD-kernel-man" package doesn't confuse the pkgbase installer, since it looks a bit like it's a kernel package (but it's not).

Hey, thanks for the ping! Adding a FreeBSD-kernel-man packages will indeed confuse pkgbase bsdinstall and the release scripts a little due to our current use of fragile pattern matching on package names.

Unless I'm mistaken though, the only result of this confusion would be that the FreeBSD-kernel-man package is not installed. There shouldn't be any errors or installation failures resulting from the confusion.

I'll write a quick patch to handle the existence of FreeBSD-kernel-man in a minute.

@ivy This should be all that's necessary to teach pkgbase installer related code about FreeBSD-kernel-man. Would you like to include this in your patch or should I submit a separate patch?

diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua
index 01eec8c44e4..1b48b4faede 100755
--- a/release/scripts/pkgbase-stage.lua
+++ b/release/scripts/pkgbase-stage.lua
@@ -46,7 +46,9 @@ local function select_packages(pkg, media, all_libcompats)
                        table.insert(components["src"], package)
                elseif package == "FreeBSD-tests" or package:match("^FreeBSD%-tests%-.*") then
                        table.insert(components["tests"], package)
-               elseif package:match("^FreeBSD%-kernel%-.*") then
+               elseif package:match("^FreeBSD%-kernel%-.*") and
+                       package ~= "FreeBSD-kernel-man"
+               then
                        -- Kernels other than FreeBSD-kernel-generic are ignored
                        if package == "FreeBSD-kernel-generic" then
                                table.insert(components["kernel"], package)
diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in
index cf8e84de692..d123394c170 100755
--- a/usr.sbin/bsdinstall/scripts/pkgbase.in
+++ b/usr.sbin/bsdinstall/scripts/pkgbase.in
@@ -165,7 +165,9 @@ local function select_packages(pkg, options)
                        table.insert(components["src"], package)
                elseif package == "FreeBSD-tests" or package:match("^FreeBSD%-tests%-.*") then
                        table.insert(components["tests"], package)
-               elseif package:match("^FreeBSD%-kernel%-.*") then
+               elseif package:match("^FreeBSD%-kernel%-.*") and
+                       package ~= "FreeBSD-kernel-man"
+               then
                        -- Kernels other than FreeBSD-kernel-generic are ignored
                        if package == "FreeBSD-kernel-generic" then
                                table.insert(components["kernel"], package)

In D51504#1176479, @ifreund_freebsdfoundation.org wrote:

Would you like to include this in your patch or should I submit a separate patch?

thanks! if you don't mind, i think it would make more sense for you to land that as you can definitely test it better than i can :-)

i'm not sure how the timing works out but, if no one objects to D51490 i'll probably land both that and this change later today (GMT+1) as i have a few other changes queued up that depend on MANGROUPS. i'm not too bothered if there's a brief period between then and when you land the installer changes as long as nothing actually breaks.

In D51504#1176486, @ivy wrote:

In D51504#1176479, @ifreund_freebsdfoundation.org wrote:

Would you like to include this in your patch or should I submit a separate patch?

thanks! if you don't mind, i think it would make more sense for you to land that as you can definitely test it better than i can :-)

i'm not sure how the timing works out but, if no one objects to D51490 i'll probably land both that and this change later today (GMT+1) as i have a few other changes queued up that depend on MANGROUPS. i'm not too bothered if there's a brief period between then and when you land the installer changes as long as nothing actually breaks.

That sounds reasonable to me, I don't think a short period on main where the installer fails to install a single man page package is much of a problem.

I'll test both with this patch but no fix in the installer as well as the installer fix and submit a separate patch with the fix :)

@ivy I've tested that this change works as expected with the existing installer scripts and merely causes the kernel man pages to not be installed by the installer (though the user can of course manually install them later).

I opened https://reviews.freebsd.org/D51519 which fixes that minor issue.