Date: Thu, 30 Jan 2025 19:30:18 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ace4637ee0c6 - main - vmimage.subr: Redirect etcupdate log to stdout Message-ID: <202501301930.50UJUIH3029330@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ace4637ee0c666c6f5a1c664f8956f7302234edd commit ace4637ee0c666c6f5a1c664f8956f7302234edd Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2025-01-29 19:38:18 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2025-01-30 19:29:53 +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 --- release/Makefile | 2 +- release/tools/vmimage.subr | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index a874aece8cdf..44cd6e4bb8d5 100644 --- a/release/Makefile +++ b/release/Makefile @@ -137,7 +137,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 -N + -L /dev/stdout -N 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 223ef928e83c..7ebf2144efe4 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 echo '# Custom /etc/fstab for FreeBSD VM images' \ > ${DESTDIR}/etc/fstab
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501301930.50UJUIH3029330>