From nobody Thu Jan 30 19:30:18 2025 X-Original-To: dev-commits-src-main@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 4YkTd65l00z5mTPS; Thu, 30 Jan 2025 19:30:18 +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 4YkTd655dFz46ln; Thu, 30 Jan 2025 19:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738265418; 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=xO1QpGeJjDvSlRdtBDQITtJ+eQhm3qXMRsQUSM9STM0=; b=rw8T5FbSJr+w8ASNJ3X+ElVePqLInlNV+za+H53xsTzS2HKetxbPd06oKqUcDxbl3iOqta f8o44o1GpV7GdUaBmwMLTHckk5CMGnu72VLJcMwlnRWEirJWiBkKemdApVGJpfOb5dFxA2 qe7rYtXEyAAOwWk2ggPCXszY9sn8ptdaYVItmTXO66gT30STMLYl00al8hRSCLRo6ODc/7 3H5U7YzbVqsX9Xk8rKg1/mgokf9DmbtWoTX3S0UH+lQm+1u4onikWDpqTRqK1IXt5XLywN 20sm0NUr0owjReF890F5Q5Vy2UvMjMKjPa7EakcT6jpFJVaKUOGAReY1OEWPzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738265418; 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=xO1QpGeJjDvSlRdtBDQITtJ+eQhm3qXMRsQUSM9STM0=; b=iMTe6OX0HqeXmFzmGUqbnWeQnLpXwMQDYBOknId7TRND2BZHtc/E01EdsZoaY1WzPftc3N l/Dd8IZmL5KA3D7Kr7rjsotXoG3JKqoQGEjnw9hrKgUPylR+hmDWE2rfHrp05kmiuDUcVE wdegmIKRJLv00OchOCQhvOLO2atxah8OGDZEyicyuHvTvn/ZI18vaAPAq1jS4OsMEswVfE lqkkGfYFXKWA6L2njkDFmNaXb0I7NnE8j4Br4lGWUCP9Qp+Zyp2DoXhyqgKaSJ4DM9ZexR T7ykNXluy2j97eG3QRaWlfsve6I+f8+NGcGWwu1/GnUOgyN/UuTO5WYG3HDawA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738265418; a=rsa-sha256; cv=none; b=Tzd2yo8zoNlJV7zdcaTjch9zwf8loW6wp6sSEEHyO6GXf/MDVcB06kYENSPwGYjEM1yxKH pXCv2dODkqEGejTyD1rYdK59+UfOV8rwNMcTA3xyyzGNYewAIwpKmAyVGa6eZJcLFbuFDd A/GZ1XeG01gseAbx/ATNlPcK3JcPzXy8JVQemTG3lY+HBqFIE3N7xBBnFWDo6dCfLrzBdf DG1obb1Kg+ZmPgpDOPsnvKlignnDpfyk2LTgICULYyzZAfcOUA6Op+YibFYgsZLYvPNeXe NTwTz5kIqBrR8EP5uo8xoU1Lb7Uh9//GGYCjC6emoWhSIFUlFViPm88YMX4C3A== 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 4YkTd64h6qz1189; Thu, 30 Jan 2025 19:30:18 +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 50UJUILV029333; Thu, 30 Jan 2025 19:30:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50UJUIH3029330; Thu, 30 Jan 2025 19:30:18 GMT (envelope-from git) Date: Thu, 30 Jan 2025 19:30:18 GMT Message-Id: <202501301930.50UJUIH3029330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: ace4637ee0c6 - main - vmimage.subr: Redirect etcupdate log to stdout List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ace4637ee0c666c6f5a1c664f8956f7302234edd Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ace4637ee0c666c6f5a1c664f8956f7302234edd commit ace4637ee0c666c6f5a1c664f8956f7302234edd Author: Colin Percival AuthorDate: 2025-01-29 19:38:18 +0000 Commit: Colin Percival 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