bsdinstall: put FreeBSD-base.conf in /etc/pkg

[ifreund_freebsdfoundation.org]

Summary

Currently bsdinstall puts FreeBSD-base.conf in /usr/local/etc/pkg.
This is however strange, since this config is for fetching the base
system.

Sponsored by: The FreeBSD Foundation

[ifreund_freebsdfoundation.org]

Currently pkgbasify puts this config in /usr/local/etc/pkg as well. I'll update pkgbasify for consistency as soon as this patch is landed (assuming it is accepted).

[ifreund_freebsdfoundation.org]

Git branch: https://github.com/ifreund/freebsd-src/tree/bsdinstall-base-conf

[grahamperrin]

Compare with a single FreeBSD.conf for multiple FreeBSD repos, e.g. https://reviews.freebsd.org/D50583.

[cperciva]

This is a step in the right direction, but I still think that we want to end up with this being part of the pkg-bootstrap package.

[ifreund_freebsdfoundation.org]

In D51916#1186602, @cperciva wrote:

This is a step in the right direction, but I still think that we want to end up with this being part of the pkg-bootstrap package.

I agree that in a pkgbase-only world that would be better, but I think at least building the system from source and installing with installworld will continue to be supported for the near future? I don't think there's a good way to include a file in a pkgbase package that is not installed by installworld.

[grahamperrin]

usr.sbin/bsdinstall/scripts/pkgbase.in

242

File /etc/pkg/FreeBSD.conf exists.

Directory /etc/pkg/repos/ does not.

[grahamperrin]

On the other hand, /etc/pkg/repos/ (if created) might be valid.

https://github.com/freebsd/pkg/commit/06cd326e85ece0ebf43090d9b739e5b408f28910 in 2013 was Attempt to load repository files from /etc/pkg/repos.

https://github.com/freebsd/pkg/blob/main/libpkg/pkg_config.c

Re: pkg.conf(5) REPOSITORY_CONFIGURATION, the REPOS_DIR array defaults to /etc/pkg/ and /usr/local/etc/pkg/repos/.

---

(Unsubscribing myself, to de-duplicate emails. I watch as a member of the pkgbase project.)

[ifreund_freebsdfoundation.org]

usr.sbin/bsdinstall/scripts/pkgbase.in

242

Thanks for the catch!

[ifreund_freebsdfoundation.org]

While /usr/local/etc/pkg/repos/ exists, /etc/pkg/repos/ does not.

Switch to the correct directory.