vmimage.subr: Fix when/where we fix up METALOG

[cperciva]

Summary

We only need to check for unMETALOGed directories and sort the METALOG
file if we're using it, i.e. if we're doing a NO_ROOT build. This
non-NO_ROOT builds by no longer bogusly writing to /METALOG*.

We only need to add databases (spwd.db etc) to METALOG if we're doing
a pkgbase-enabled NO_ROOT build; but we should always do this before
creating the filesystem, not only if we installed extra packages (in
vm_extra_install_packages, where that code was erroneously placed).
This fixes non-cloud VM images, which in 15.0-BETA2 shipped without
password databases.

MFC after: 3 days
Sponsored by: https://www.patreon.com/cperciva

[ivy]

release/tools/vmimage.subr

302

is there any harm in doing this anyway for a non-pkgbase build? or is it handled somewhere else in that case?

[cperciva]

release/tools/vmimage.subr

302

For a non-pkgbase install this is handled by code in various Makefiles, e.g. https://cgit.freebsd.org/src/tree/lib/libc/gen/Makefile.inc#n584

It would be sort of harmless to include here anyway since we're going to remove duplicate lines, but for clarity I'd prefer to only add the lines when needed.

[ivy]

release/tools/vmimage.subr

302

okay, that seems reasonable.