From nobody Thu Jun 19 18:17:13 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 4bNTNB10zqz600N5; Thu, 19 Jun 2025 18:17:14 +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 4bNTN972Jzz3ydx; Thu, 19 Jun 2025 18:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750357034; 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=/MTHirSFyziZcWbpTJmzZRTe77rFnSmCCwMKU0erb0M=; b=Nuh2CMGzvFNGt916v3aSE/kFHA2OKr973sJu0v0rHsjwKqokYnBaBMeTEH/gqKoaQ5ApH4 ymmQ4oQvltHLUSn3EDkzpidQCsPP5Jl5zCnMspcHwMGjnhPhNZ0tX/2L7Zw9KGjGEyV1/Z hxGPJ/Lm2fid6aTLzumBWglVslnMr0a6Rs71dUoX78doqy0NR9WrUbOS5WaGxEX0F/setE WsIIuOBEE0yzHWNxShWGOSOwYFUaBU8thZaNRhAsXJ38ZIq0VDkn1EUnoIZ/dCXftqlRh2 ef01b2Lw/B6uL1fWN+WEgCed6d8MchpKPRkLiuGBFqtCDfpQ8BNFGLjZLT5opQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750357034; 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=/MTHirSFyziZcWbpTJmzZRTe77rFnSmCCwMKU0erb0M=; b=BUTbiZf/tIgmZ3nPK094jiTErsDHIg7NtPB5sivOdll62yzAQjk8r6R0BFeLs8BHQ94pxT q/RFcEE1ZIXH946PzQt6dxOqwIFKftnIV0WZnXVEbpbTNrscHXDMgSgxgnXQi3CQGpKnoZ 7eAxd4ccXAbIC8lFN8ImRGFDJ/fz6nVuMDMzEM0vklqBSgrQcbJ9D7p62KTDcrIJGGYovj PAzzytgbOpLToeSlZ+h42oYxx0vhZJ8juDwYvtgBXRWypMb4JHAqLQipIlfmNRKm9DzZXg KrhbgkgqYBt60iM9nwSzP0GfpC703l2wZI8Xqdxn2TTCTMK7zfrDXdByLnJ+kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750357034; a=rsa-sha256; cv=none; b=fyd9duPG9TA0wMrlpeEe+hCG9b+RUreP3JWDr0jdmmhw0vgKWvSOQ7W0A62YrpZAvjQj7A rxmf5PRStepC4b57ohrpoDEss9NrKizQHW5+cThLV45bQfTyY1abNXVFaQcFXt8D3GXlIv WIdM4zMTLZlAEbVPmggcx68R7yU2txBEzqvrHKELLbnhjV1kB/vUZJAEB90aanBqaRRnEy Bih6EPJkqq/iq6qtlrAk1izpAVmuIxvRxQ9c4StDKzfKP8UruX88jLaQR+1DtS6rOm96gL PKmts1OgIDxlc0+TsQkAgSjQPu5bm8ciz0LPVz/kpPtwpGt5382+D/xTIoX07w== 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 4bNTN96Xb4z1PHY; Thu, 19 Jun 2025 18:17:13 +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 55JIHDAu037732; Thu, 19 Jun 2025 18:17:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55JIHDqN037729; Thu, 19 Jun 2025 18:17:13 GMT (envelope-from git) Date: Thu, 19 Jun 2025 18:17:13 GMT Message-Id: <202506191817.55JIHDqN037729@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: e094f9015be1 - main - release/GCE: Remember whether we mounted /dev 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: e094f9015be16d07fe1c78c6eeaad73d1f8705ec Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e094f9015be16d07fe1c78c6eeaad73d1f8705ec commit e094f9015be16d07fe1c78c6eeaad73d1f8705ec Author: Colin Percival AuthorDate: 2025-06-19 18:15:10 +0000 Commit: Colin Percival CommitDate: 2025-06-19 18:15:10 +0000 release/GCE: Remember whether we mounted /dev Don't unmount /dev inside the image if we didn't mount it. We might end up unmounting a /dev which is still needed. Fixes: 611c1457ff32 ("release: Add set -e to abort upon failure") --- release/tools/gce.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index fc72b381a02d..382a839786f3 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -24,6 +24,8 @@ vm_extra_install_base() { } vm_extra_pre_umount() { + local DEVFSISOURS + # Enable growfs on every boot, not only the first, as as instance's disk can # be enlarged post-creation sed -i -e '/KEYWORD: firstboot/d' /etc/rc.d/growfs @@ -93,6 +95,7 @@ EOF # and fetch the sources for the third-party software installed on # the image. if [ ! -c "${DESTDIR}/dev/null" ]; then + DEVFSISOURS=1 mkdir -p ${DESTDIR}/dev mount -t devfs devfs ${DESTDIR}/dev fi @@ -107,7 +110,7 @@ EOF make -C /usr/ports/${PACKAGE} fetch done fi - if [ -c "${DESTDIR}/dev/null" ]; then + if [ "$DEVFSISOURS" = "1" ]; then umount_loop ${DESTDIR}/dev fi