git: 1dbcd9a15c9d - stable/14 - vmimage.subr: Redirect etcupdate log to stdout

The branch stable/14 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=1dbcd9a15c9dfcb9ce433fa8109c65b8690db7d4

commit 1dbcd9a15c9dfcb9ce433fa8109c65b8690db7d4
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-01-29 19:38:18 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-02-06 04:14:21 +0000

    vmimage.subr: Redirect etcupdate log to stdout
    
    While we're here, send the etcupdate log from generating base.txz
    to stdout instead of /dev/null (see e972e408d19a) as well.
    
    Reviewed by:    emaste, gordon, jrtc27
    MFC after:      1 week
    Sponsored by:   Amazon
    Differential Revision:  https://reviews.freebsd.org/D48719
    
    (cherry picked from commit ace4637ee0c666c6f5a1c664f8956f7302234edd)
---
 release/Makefile           | 2 +-
 release/tools/vmimage.subr | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 152c2edfcf06..d9d5d459b5bf 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 3761faf94810..04c0d5bb2bb5 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}