On Thu, Mar 27, 2025 at 10:40:32PM +0000, Colin Percival wrote:
> On 3/12/25 14:07, Brooks Davis wrote:
> > commit c41ba99779d0431c37ac06a674e7744d15de8045
> > Author: Brooks Davis <bro...@freebsd.org>
> >
> > release/vm: partially support NO_ROOT
> > --- a/release/Makefile.vm
> > +++ b/release/Makefile.vm
> > @@ -126,6 +130,7 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT}
> > env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
> > QEMUSTATIC=${QEMUSTATIC} \
> > WITHOUT_QEMU=${WITHOUT_QEMU:Dtrue} \
> > + NO_ROOT=${NO_ROOT:Dtrue} \
> > ${.CURDIR}/scripts/mk-vmimage.sh \
> > -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F
> > ${_FS} \
> > -i ${.OBJDIR}/${_CW:tl}.${_FS}.${_FMT}.img -s ${VMSIZE} -f
> > ${_FMT} \
> > diff --git a/release/tools/basic-ci.conf b/release/tools/basic-ci.conf
>
> This is broken, since src/Makefile.incl assumes that NO_ROOT being set,
> including to an empty string, means we want no-root behaviour. As far
> as I can tell this hasn't broken anything except that VM images are
> shipping with a /METALOG file inside them, but it could probably cause
> worse problems later if it's not fixed before more no-root work happens.
Oops, that is indeed the wrong substitution. I've posted a fix in
https://reviews.freebsd.org/D49544
-- Brooks
