From nobody Thu Feb 06 04:17:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YpP2C1X5Qz5n07c; Thu, 06 Feb 2025 04:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpP2C0tCCz3DPJ; Thu, 06 Feb 2025 04:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738815427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e3Ffq3gtq4VleY7Ra0Q13rdVYV0/9wMV9AwEBsn6QH4=; b=wq2CXcQ0htWwwloZmgdAnSRz5EhT6/rXDcc89LfQYgTV+Vd8aVDuw0IgBA/eQmAH5id/gF 5G+Z/zMorcfgt/dJ+jjJtfqRwfygJOZavVFMnv+PbE6S02FgCUmmaEdQP8WFCKetTsg0PC 30JMbYxFPpwjvXV+JpMj/Zd5F0ZL7zT2K5jNs3h6FBUPtA5vmWExVXNIgR9DrxCsFZfz5N FnD24ulx/u3LDiew0Mp/aPnWsBYJnncEF0sYt+htwkYBtip3dqhZ/gWaz1tkwO5SW7tqn6 DS0zrgBkrnlElvk+gQeQK1njT58fAL44op3zYbIlwmxi5yfu9kbxbSk5xDxrrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738815427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e3Ffq3gtq4VleY7Ra0Q13rdVYV0/9wMV9AwEBsn6QH4=; b=ilkehTQQRz4/25/ObDR+xRM33/RhH4ofUGQ61WmMfrQfQG9bS7MDB0Aa4UzYJU+8hwWSyi HslSwYVNfZwGtEewEk/gzTr/iziGt0s/zvzFTWcS7yW8frfnent+UGvT+8iLOL9V2r/C98 G0sX/nKNNvnKUWU5hpbnDIdvVzfUUBuJhz03SKd83eKBSPsjeBUQhIOaPiZFu85LVJhQLA kjvXXP2CjacbFKhEJdha1C+aXkVCwl/HORwS38gKeU5IKQv71ESDiUPRM6dpEqyaW55D7S W18vldnXPyTc2pg7YQXEmkWuqkwVlBQkvMK+tpvsR5VVCiOOP/1RXMQi38Yz5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738815427; a=rsa-sha256; cv=none; b=aAFMTQqeq1MEA148/0UY2kBi1gh4lzSw9wakkF1U3mNGiQiNH1QyuFwHX+HxIIm7JLSjt7 Wcq5eBqKhDvnjBfga6LOCxM5NycLwL76Qhe6nGENO3XWfG7dNrhHxB0oDgX56sKJlg+vKo s61IMMMw18ofW54RFyFJ1sP/IdUnMNmILpUB7CCz3SApgBZircOaaJreXEiNjvoUKgVyGC Z9JR0cxc9yqnYHIunzwaVgwqGU1GHX0WSCNGKym/qMjQaPwNzyXnBezOIQXDw3zRAWjnUC GzqzTkQMMe6EJGGL6oFwSnzYb4Ktmo/RIhzsp1+8QMchiy5ufsN6/IEizYwuuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YpP2C0708z6hs; Thu, 06 Feb 2025 04:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5164H6uN028729; Thu, 6 Feb 2025 04:17:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5164H6Km028726; Thu, 6 Feb 2025 04:17:06 GMT (envelope-from git) Date: Thu, 6 Feb 2025 04:17:06 GMT Message-Id: <202502060417.5164H6Km028726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 00db5c7152e8 - stable/13 - vmimage.subr: Redirect etcupdate log to stdout List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 00db5c7152e858aa010feb0f6c981d0cfd5f40ea Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=00db5c7152e858aa010feb0f6c981d0cfd5f40ea commit 00db5c7152e858aa010feb0f6c981d0cfd5f40ea Author: Colin Percival AuthorDate: 2025-01-29 19:38:18 +0000 Commit: Colin Percival 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}