mirror of
https://git.freebsd.org/src.git
synced 2026-01-16 23:02:24 +00:00
release/vm: fix setting NO_ROOT and WITHOUT_QEMU
To support common shell patterns (test -n and -z) we want NO_ROOT and WITHOUT_QEMU to be set and not empty in mk-vmimage.sh if they are set at all in the Makefile. Actually do this rather than making them always set (which propogates to submakes run by mk-vmimage.sh and unconditionally enables NO_ROOT with undesirable side effects such as installing a /METALOG in vm images). Reported by: cperciva Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D49544
This commit is contained in:
parent
86dd379d3e
commit
e6e5cd297a
1 changed files with 2 additions and 2 deletions
|
|
@ -129,8 +129,8 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT}
|
|||
mkdir -p ${.OBJDIR}/${.TARGET}
|
||||
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
|
||||
QEMUSTATIC=${QEMUSTATIC} \
|
||||
WITHOUT_QEMU=${WITHOUT_QEMU:Dtrue} \
|
||||
NO_ROOT=${NO_ROOT:Dtrue} \
|
||||
${WITHOUT_QEMU:DWITHOUT_QEMU=true} \
|
||||
${NO_ROOT:DNO_ROOT=true} \
|
||||
${.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} \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue