From nobody Thu Jun 23 15:21:49 2022 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 B9DE987D9D9; Thu, 23 Jun 2022 15:21:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LTP9n4xCmz4nKG; Thu, 23 Jun 2022 15:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655997709; 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=dfJmfrLOGGLUXI49/OJ2pYPUXDXyEuEKk5hT7a/JE+c=; b=LznLJVSgu3f90JYOezP1oFxP1PWE+5SCYSCUtatKNrpK1oTyQAlFIVRtTgmZYYtAcG2B7I KosCbLTl7kMc990mxuAo9Jap1c0NTh3CbH4bSMb+MGdeRyf3fU+FPWcPyb1Gxj+ZNnRZfv icRYcQRnahGJYoI1CuooD0cyo8nfzkp3fh2b9rRE5XjlHzEionWBKc2JUo3NZ11rmbKGPY FpLKkehXDobYGG4FBAqZxycLExGFOBtRWSexsyfvsX/aC4x0k6AoI4B0qrYkFZ0nK8mAkP B9iACl113B74UN24CaL/p2Slz4UPcsiT/eXvqsyijTWXcTfjN9TW6yATVejn8Q== 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 896B41D758; Thu, 23 Jun 2022 15:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25NFLnl9080872; Thu, 23 Jun 2022 15:21:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NFLn7u080871; Thu, 23 Jun 2022 15:21:49 GMT (envelope-from git) Date: Thu, 23 Jun 2022 15:21:49 GMT Message-Id: <202206231521.25NFLn7u080871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brad Davis Subject: git: a320e9dd51e6 - main - bsdinstall: improve zfsboots ability to handle datasets under a BE 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a320e9dd51e6e58715a1390f2e00790a94017dfb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655997709; 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=dfJmfrLOGGLUXI49/OJ2pYPUXDXyEuEKk5hT7a/JE+c=; b=pfqxxOVgmrZ8VXDDx1zgR7ZgRsuIVFQfbv1GT/t8f7OmU2tVtcuG5i9I0NTjbU+kbZqIVF PPWJr7IdG386J5e96c3sR3o71F5VA/cQrY0eerbeN2/UCL2D1OEikUXkWyyJbSlA3t+5Vz vk/SRAuFqureH4jbN1vkb6HL6aIZgFJYIobKa81XQhaW7GXtBtfsyb9zCNjkyUUH0ntFYr UKw+BQrwJ716wVJNAR5npFhGFbYvkeIru6BOr5CPse1xP3ekfyRZYHGdSYB0qiCuKnLjJG riDroNiz9H/Tk5LlmuUifXTcrzTE2WMOV9ay6eF9hDJdMJje6P+yH//sjKXqCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655997709; a=rsa-sha256; cv=none; b=VByBnEgIhMVau+kmcudlYk8HDf0tKxs8ZHHFXGZlGx/RN+6cOxS8BGHA3Kr0iNwf8Iq/jP e+h0dRjbysnN06KYsXg7dQFY1s8BNVUEMnMBSTaYChy2pM3mCCASN0zGZ9sEBkbAyAN8Vk LrwODkSMGZiwSu1B81WorlExCGqTg2BKNU1MUUy5M2gpGUJ86nl3ftxIXJNynFvAbQlUZN NJfbUgLSE/cKpZO5Wx0YjasYo9lizhCF4OB5+/9ry5sQillbqN33Ai+oPLG+YUtQm3JypD SGws7dkqGPyhNTggdiw0aD/xvlK6sZm0ttTIjK08ziYCr80zIcHaRJL8olFlMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=a320e9dd51e6e58715a1390f2e00790a94017dfb commit a320e9dd51e6e58715a1390f2e00790a94017dfb Author: Brad Davis AuthorDate: 2022-06-07 17:11:02 +0000 Commit: Brad Davis CommitDate: 2022-06-23 15:21:08 +0000 bsdinstall: improve zfsboots ability to handle datasets under a BE Currently we only set canmount=noauto on the root of the BE, this change makes it so we set it on all datasets under the BE as well. Reviewed by: allanjude Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D35422 --- usr.sbin/bsdinstall/scripts/zfsboot | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index dc9d35feaa78..1e771710cb7c 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -1473,9 +1473,18 @@ zfs_create_boot() # Set canmount=noauto so that the default Boot Environment (BE) does # not get mounted if a different BE is selected from the beastie menu # - f_dprintf "$funcname: Set canmount=noauto for the root of the pool..." - f_eval_catch $funcname zfs "$ZFS_SET" "canmount=noauto" \ - "$zroot_name/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME" + f_dprintf "$funcname: Set canmount=noauto for any datasets under the BE..." + echo "$ZFSBOOT_DATASETS" | while read dataset options; do + # Skip blank lines and comments + case "$dataset" in "#"*|"") continue; esac + options="${options%%#*}" + # + case "$dataset" in "/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME"*) + f_eval_catch $funcname zfs "$ZFS_SET" "canmount=noauto" \ + "$zroot_name$dataset" || return $FAILURE ;; + *) continue ;; + esac + done # Last, but not least... required lines for rc.conf(5)/loader.conf(5) # NOTE: We later concatenate these into their destination