git: 00db5c7152e8 - stable/13 - vmimage.subr: Redirect etcupdate log to stdout

The branch stable/13 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=00db5c7152e858aa010feb0f6c981d0cfd5f40ea

commit 00db5c7152e858aa010feb0f6c981d0cfd5f40ea
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:16:23 +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 9feb4d170a41..2ad822084737 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -122,7 +122,7 @@ base.txz:
 	    "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \
 	    -D "${.OBJDIR}/${DISTDIR}/base"
 	etcupdate extract -B -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
-	    -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" -L /dev/null
+	    -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" -L /dev/stdout
 # Package all components
 	cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR}
 	mv ${DISTDIR}/*.txz .
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index c4daf3039f8a..81ea88255c96 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -62,7 +62,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}