From nobody Wed Dec 11 01:19:23 2024 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 4Y7HnR43Wbz5g8HX; Wed, 11 Dec 2024 01:19:23 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7HnR3P0Wz3xFl; Wed, 11 Dec 2024 01:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733879963; 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=ppq4Ooj5X2s91MOPC4GrmNolg5NbgwQk6D5Od1QYKQQ=; b=Kv0zISvA3d/kqqPI96sH2z2b1r+qJKfO1jIen3kNfhf3sHd8/7/0pLppRIZwN2YjWT8nR6 nl9469pRbw3Ikyj1XAc2PFoFP9gD4nnMrilW0WYG3tScz799nWSd8i35Yer7sl4FZQJLXE /5GrZJmR7yiSWgmmBaenDKa5Ru9OMGkTmYazK83ucGVPtIQ9zmYMopkkm4Xei7r02jQPPJ aD+l7hN1u7YoVcVbEbAgDUJ3PxmW5BinKAdNnJmafUPHgiHl8w+DSx8uu0hxMHRlrV9r4f CLFg7xqfKYVCRz2ka5nCdzUJuE361sxquDNfKkcSzcyQ3ScFR7WwEEH6iYy01w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733879963; 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=ppq4Ooj5X2s91MOPC4GrmNolg5NbgwQk6D5Od1QYKQQ=; b=uSxq0XGr+9UGm6UsryGPokOsdeHfLYWwd5ndRSELMB0WPxMsNsrO8JIXKkDyL6DYsjpuBe xttimPrVP54tRWwXj/gbZjYkAl/vQ2mAAPsQT/xFNzzW9tMiR5npv8deQLLeQCfn82uWlV ez8Z1vcsgSGsCcw+hRHqFW6YqsVNJcQuTj2X0wShWpF9lZ8rD+nEImWOWCcrVwJdsgWOh3 6WddxB/GlvmimQsLOsTjmigq8FNImv8N0H+CItmOkvhPbH9a8RtewUCiZmVOekkB056p/O /GV5slDSyll261lCG3phUlJZx6wbRzjlcYG4MVzyEu7HfsyZJDWktytNZcOeXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733879963; a=rsa-sha256; cv=none; b=YlYC/FLckKYTMCkh2ILrOslsqa19J70aBTRlmiXlTNl0VFATxXqGpHwC39rUqfRcn4jMaC r6PIvGMgeYH1i1ShkDEWSx0MfCM/kyWMAtt8M+7d576UKyEAICdDkkTqjXXvi7FarDA1eP GlYazbc9njZmwd6PwfT8z3xu0vZ2LSuMdaZG0zusb9jQdtSHx0XdyEdlMC5SmeH2MPfD/u ucEJpHqk9T4gC2c0/5xsnIPDO8z3jDFtMXYUZdbsJWY7A7mJqP8X93MgPtV3EJ1x0BAnNH v7Qzm11NzEAkUoN+PrPAqA2GwsIMZqKD4OoR1oTfwLkiFogCS2acrlfc9MDu0g== 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 4Y7HnR2mCmzmnc; Wed, 11 Dec 2024 01:19:23 +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 4BB1JN3H007323; Wed, 11 Dec 2024 01:19:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BB1JNlV007320; Wed, 11 Dec 2024 01:19:23 GMT (envelope-from git) Date: Wed, 11 Dec 2024 01:19:23 GMT Message-Id: <202412110119.4BB1JNlV007320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 636d377264f5 - main - release: vmimage: setup the default BE properly 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 636d377264f51e3dd33bd7f33ebf03e2e148d40d Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=636d377264f51e3dd33bd7f33ebf03e2e148d40d commit 636d377264f51e3dd33bd7f33ebf03e2e148d40d Author: Kyle Evans AuthorDate: 2024-12-11 01:19:08 +0000 Commit: Kyle Evans CommitDate: 2024-12-11 01:19:08 +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 Differential Revision: https://reviews.freebsd.org/D48017 --- 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 5d98b8990705..223ef928e83c 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -187,7 +187,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 \