From nobody Wed Jan 01 05:46:02 2025 X-Original-To: dev-commits-src-all@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 4YNJjQ3dTJz5jNYX; Wed, 01 Jan 2025 05:46:02 +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 4YNJjQ37KVz4Njp; Wed, 1 Jan 2025 05:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710362; 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=K/Njmc335T67EvTOohqNY76d75HIzQrJ3CR8ZDLdYj4=; b=aEKRF5SpDRpPFJfhre39rcvlX9vauZeLeayLlzub2jtyFvJ6vP2BtgqxqekqL53yWbXZcR eW8OpRWtNGp3X7t6cjgKSjI6vYLe1Lgadpx8AEbLRl79AQ1WG/rHUewupSgTF4Fz8X6ufK F2HvMkUtJsz8OnBT15HpmjeaQVXON1y4l7FNrA6JM9h6yGM1SrDMa8TP53TFSdLjDnKK5R H2ERTGelEa2BPYIo9ZKrkFxXW1YiuuS714oLDGwIidMQq6yIoIcTlt91lr2G+tHrkHuDtr tjPLkSXnVKrBLw5y+K0MZ4H0IJ/MedWfO+JhI4kd+ZTAmefIgz2mFw9QwYLDKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710362; 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=K/Njmc335T67EvTOohqNY76d75HIzQrJ3CR8ZDLdYj4=; b=e0rNLjNzht2wE8FVWKWjeHS8zxV5aVpECtYlk5n1qMK1p0K6aUXWJV1jXxQwBg603NBT3n mgouJ9V6USWeA48966QVT6HKrjYxMBPi31KaJqgiHXrOuGBZsEyMZc/Ynq02aIA1js32D8 U06IQRTubo11ysI9l8XI1SI3GlFZd6eoXCazWzRJzVmWVXo/huZI//Ip8RkBZfowjOyzZp dpiXeK1qXKne+8fRBMYsT3hAqNzpFr5X2cmdnSBYWrIRYb2slLxJntKU7jUFSuRvd0aoT2 s/4iK1LBrrEe5dn0vIZJsbJFE/Fd3pkEL5FPIe72aNE6kno9CzKuTqvbQKYixQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735710362; a=rsa-sha256; cv=none; b=uKCnTd8ovYeW/AW90uCkTaE/Mdjz8BIlNhghVDhdjXPmcmcZHADpoMptxfcFubvEEdMpin aFnoSAauaLNu8PM3OuiqH4MaM2rFWeoRjUmTV7D7XYPDHIIH512qfhqkb+9omQpGeDZyPV igUwZrW6VEU6bU/B1rZ+/d5F3K5SLtpPL6WjVB+7Q1iu0DpyJou+hdGot46Xw+omeyvwpW mi0pKNpiTjEgVr7WzfT8y+J9Le9JikcLYB7vrIStosrvmnp1kKa7g6fHh5fJXggqRL+hC7 Yl21egdWGDr25znrd16W2HFJxE0xRtpjAS9yLgV0QdA7YjcfgEO+oqvP5AVGHA== 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 4YNJjQ2kNYz1BMl; Wed, 1 Jan 2025 05:46:02 +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 5015k2UX038328; Wed, 1 Jan 2025 05:46:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5015k23U038325; Wed, 1 Jan 2025 05:46:02 GMT (envelope-from git) Date: Wed, 1 Jan 2025 05:46:02 GMT Message-Id: <202501010546.5015k23U038325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 18bbc3c82e13 - stable/14 - release: vmimage: setup the default BE properly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18bbc3c82e1343d28a1fcad731f28c889602a363 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=18bbc3c82e1343d28a1fcad731f28c889602a363 commit 18bbc3c82e1343d28a1fcad731f28c889602a363 Author: Kyle Evans AuthorDate: 2024-12-11 01:19:08 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 05:45:15 +0000 release: vmimage: setup the default BE properly All of the BE datasets need to be set canmount=noauto so that creating a new BE and switching to it can actually work. With the current setup, the zfs rc script will mount the `default` BE over whichever new BE is activated once it runs. Reported by: andrew Reviewed by: andrew, re (cperciva), imp, markj (cherry picked from commit 636d377264f51e3dd33bd7f33ebf03e2e148d40d) --- release/tools/vmimage.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index c95a6dc82937..3761faf94810 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -190,7 +190,7 @@ buildfs() { -o poolname=zroot -o bootfs=zroot/ROOT/default -o rootpath=/ \ -o fs=zroot\;mountpoint=none \ -o fs=zroot/ROOT\;mountpoint=none \ - -o fs=zroot/ROOT/default\;mountpoint=/ \ + -o fs=zroot/ROOT/default\;mountpoint=/\;canmount=noauto \ -o fs=zroot/home\;mountpoint=/home \ -o fs=zroot/tmp\;mountpoint=/tmp\;exec=on\;setuid=off \ -o fs=zroot/usr\;mountpoint=/usr\;canmount=off \