diff --git a/release/Makefile b/release/Makefile index 152c2edfcf0..d9d5d459b5b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -142,7 +142,7 @@ base.txz: sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \ - -L /dev/null ${NO_ROOT:D-N} + -L /dev/stdout ${NO_ROOT:D-N} .if defined(NO_ROOT) echo "./var/db/etcupdate type=dir uname=root gname=wheel mode=0755" >> ${.OBJDIR}/${DISTDIR}/base.meta sed -n 's,^\.,./var/db/etcupdate/current,p' ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG \ diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3761faf9481..04c0d5bb2bb 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -60,7 +60,8 @@ vm_install_base() { mkdir -p ${DESTDIR}/var/db/etcupdate etcupdate extract -B \ -M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ - -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate + -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate \ + -L /dev/stdout sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \ -F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ -D ${DESTDIR}