From nobody Thu Feb 6 04:14:48 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 4YpNzX5dF4z5n0Ph; Thu, 06 Feb 2025 04:14:48 +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 4YpNzX4kCbz3D35; Thu, 06 Feb 2025 04:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738815288; 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=fbcVxPuzFJWugKT8ijyNCvCWjlK7NDELlrQIB0HmxAA=; b=sK/bdKiolQI9sYC6EOWyYRx9Bvgbiy1FByAmArkZOENBOgVixsWKvuPPQb4kdVRzJ2SmwP LziT5vLtT6Spkg7tKcXQijbBTFhUiZcPh9B3aVyjER4cRudhkbjWuwWsWe9AyYnh9LgiDB MhkHgK4469IjG6UisEG9cP98hfWuyn8olkyUpRe2zBpJAQkaaYI5t1EC9pJ+9Nu1MfQPw9 b7cEQSyfcrmipCfbBnpbfeqlNcNqcvKXD5WSJSmoi4Ce5OpCwQXasuyysUOkxMNDOrKjfN sZrIQYamRuixNkJ75quTl8ZmQIG68pdAKBZPH4FGKkVhq4W6bJi/SkiSqApQ/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738815288; 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=fbcVxPuzFJWugKT8ijyNCvCWjlK7NDELlrQIB0HmxAA=; b=aB2BuhAEBnxT3L87j9wna4dWiuJ/nyl9xrzcGf3EoDeplexm+DNdA/C+CArppx4knUwgWs SryXhgQwgTd+5kH7CCNL7BhOAmzYkfnVABfZzgaoz9EzNfxcxZ7yJW8ELCu2vwFlzB3zbN OH/vCwgFHb/PwRBu8Mo4usHaCP40ab9hrm/ZE5xiJQvvKeSCw/5EvuyBfvtjhQgOsxZ9Vo oLuGlEJMQS4j2KBptrO5kRwF2vqEGL2KsF07h6PPXOPpBORYRnfoIAKbL85a/i5XBoCkcj oSmq8BWJIL37W/Jpbzu57APzFrc98xynPJWuYTN7LL0JZz8yY8cS8KQS7bCTJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738815288; a=rsa-sha256; cv=none; b=iO4F2L7fc949mVORXseoPxpr4oYErSsEAKi7dDuWsirwjMUk1lFK0hV40eaUew5qZgARPR aHuzLbl5zHsIbIU89Wq3XeFFCeakxzAJOq2lqKhVkSh9kuJKgPbD5JeEmGFzOKQEc2NKIx M2XZ1cDehm34LNcGXbx80LNKeLSy5Int4z1ln/TVbyejOov5KJx4vnVuvKX8d75vUC2oSj Mg177503DmctH9w8lJ/KNpVnNJT+8KHRJjiun5rZWGEp1AhBDiRO8oXHMemVKBAZU7HeVC nHIDU++TrFlQqbMqaarAWdrcyiUbVGDQqBbh8xFoHL9UNWPZ0+/xpDop6NdsnA== 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 4YpNzX4GT6z6v7; Thu, 06 Feb 2025 04:14:48 +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 5164EmrS027914; Thu, 6 Feb 2025 04:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5164EmfE027911; Thu, 6 Feb 2025 04:14:48 GMT (envelope-from git) Date: Thu, 6 Feb 2025 04:14:48 GMT Message-Id: <202502060414.5164EmfE027911@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: 1dbcd9a15c9d - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 1dbcd9a15c9dfcb9ce433fa8109c65b8690db7d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1dbcd9a15c9dfcb9ce433fa8109c65b8690db7d4 commit 1dbcd9a15c9dfcb9ce433fa8109c65b8690db7d4 Author: Colin Percival AuthorDate: 2025-01-29 19:38:18 +0000 Commit: Colin Percival 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}