From nobody Sun Jun 1 09:22:21 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 4b9BMK57cjz5xP6V; Sun, 01 Jun 2025 09:22:21 +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 4b9BMK4Sy1z3cGZ; Sun, 01 Jun 2025 09:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769741; 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=EjcQtKaWgVpKP8FR+jxLGap5ceY3XeQOQiN6MDBjF00=; b=InmsJwS2H50Y+kk5wLpR9x4Sbko51vKh7IX/qiVAVYBHDzXYLLg0zb9t6bOmOt32d/EfVr Lr+ow88fm9+0rZlt7WEdoDjMPpGhKBNLPlu6DfivSutNEdcL2xXDrRpR2Zr8FkDr0fWDNA so1qx8k41wA1iCzH8z0DW1zGC6Ouh2nyzIjJkE0vKSDZfKcgdhxVs7KIUoI3hZykqrCs8W t6T0y1DiTN40AOuuL7uktyisCKPg5IRy3O9MO2BaOWXxbY7Qx4qNDtPAvRpYHIYTYxU6En nr6u/UpJ84mdmcrUnGBCr6sDE2KtPx5VZHvLsUeFrbPpd9qbRccQ5qLQPqqoQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769741; 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=EjcQtKaWgVpKP8FR+jxLGap5ceY3XeQOQiN6MDBjF00=; b=MrBaUSU5P7k3u1/yvMxfuFunj0ajpbDiTrDn7nLkAr5M+0ZxAmCjFiuUtC5h0b5hbS0fCS j9qf8Me8nIMC3I6rZI/ImLS11Yw7/26PZdCZdPdazGqlqm+PriCyueAbQqkSfl9vcMzniV R2I3ef8bi35dEgUarXPtzXw+FDFHsfdlDXFPgLu6EOWcgxeS8G8ZeAYmHcr4PbtAkjo0uD H9nAO9Udmpx2f3GZA9WVsjio0us0SpzMQ40Lz8/z5aoCUsCLTylIcO/Aj+zflwzK6XWyei xX9Oy6DjqDMwsh0TaIzkiTtDkqU69/6vNnPXY56tfENHJP0X7pS7hwJsSdaCtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748769741; a=rsa-sha256; cv=none; b=KBN3YXck/K1ZluyDHor2vIBK0uiHQ1YD5j5kAZuiAFPCSuptoWsOCbYHTt/Lczv8gyLGWC /zzYuYjxLIop7jnueJ3xodRKg9gZykOJS6WtwKjfNXs1Wyljk6Kl3TkqQFTCyxMuQt1bSr CrAXF8EQv1STAcaylObLr8yw+/QRQuwBAsk70XVKvc+qW2Gl6zZ6ZtHPVKwPH8cjaMWavG ZmmE1RAwc94EE4+RcCwG89WRYjs+wOwIcxBDktgeCC52t0Mms6hoOwc+grYl4ZamPWz5bM OzXSDyNMhTspIuCXrqQldpyID1dtRadECcCG+Ek54NRsD+4Cn6ZyxnoW1EHkFg== 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 4b9BMK419vz2qp; Sun, 01 Jun 2025 09:22:21 +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 5519ML86049116; Sun, 1 Jun 2025 09:22:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5519MLXn049113; Sun, 1 Jun 2025 09:22:21 GMT (envelope-from git) Date: Sun, 1 Jun 2025 09:22:21 GMT Message-Id: <202506010922.5519MLXn049113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 1b9a53e3805d - stable/14 - zfsboot: fix misuse of the phrase zpool 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b9a53e3805deb0b95760fd34025d4d0a4f96f41 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1b9a53e3805deb0b95760fd34025d4d0a4f96f41 commit 1b9a53e3805deb0b95760fd34025d4d0a4f96f41 Author: Graham Perrin AuthorDate: 2025-01-10 18:02:25 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 09:14:51 +0000 zfsboot: fix misuse of the phrase zpool A pool is not a zpool. Reviewed by: jbh, ivy Approved by: des (mentor) MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1569 (cherry picked from commit f69afe4201ff33da0b3c3ca464a92e2e0b07ac43) --- usr.sbin/bsdinstall/scripts/zfsboot | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 6c6c81a7f010..59e6359d311e 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -121,7 +121,7 @@ f_include $BSDCFG_SHARE/variable.subr : ${ZFSBOOT_BOOT_TYPE:=} # -# How much swap to put on each block device in the boot zpool +# How much swap to put on each block device in the boot pool # NOTE: Value passed to gpart(8); which supports SI unit suffixes. # : ${ZFSBOOT_SWAP_SIZE:=2g} @@ -137,7 +137,7 @@ f_include $BSDCFG_SHARE/variable.subr : ${ZFSBOOT_SWAP_MIRROR=} # -# Default ZFS datasets for root zpool +# Default ZFS datasets for root pool # # NOTE: Requires /tmp, /var/tmp, /$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME # NOTE: Anything after pound/hash character [#] is ignored as a comment. @@ -285,12 +285,12 @@ msg_odd_disk_selected="An even number of disks must be selected to create a RAID msg_ok="OK" msg_partition_scheme="Partition Scheme" msg_partition_scheme_help="Select partitioning scheme. GPT is recommended." -msg_please_enter_a_name_for_your_zpool="Please enter a name for your zpool:" +msg_please_enter_a_name_for_your_pool="Please enter a name for your pool:" msg_please_enter_amount_of_swap_space="Please enter amount of swap space (SI-Unit suffixes\nrecommended; e.g., \`2g' for 2 Gigabytes):" -msg_please_select_one_or_more_disks="Please select one or more disks to create a zpool:" +msg_please_select_one_or_more_disks="Please select one or more disks to create a pool:" msg_pool_name="Pool Name" msg_pool_name_cannot_be_empty="Pool name cannot be empty." -msg_pool_name_help="Customize the name of the zpool to be created (Required)" +msg_pool_name_help="Customize the name of the pool to be created (Required)" msg_pool_type_disks="Pool Type/Disks:" msg_pool_type_disks_help="Choose type of ZFS Virtual Device and disks to use (Required)" msg_processing_selection="Processing selection..." @@ -323,9 +323,9 @@ msg_unsupported_partition_scheme="%s is an unsupported partition scheme" msg_user_cancelled="User Cancelled." msg_yes="YES" msg_zfs_configuration="ZFS Configuration" -msg_please_enter_options_for_your_zpool="Please enter options for your zpool" +msg_please_enter_options_for_your_pool="Please enter options for your pool" msg_zfs_options_name="ZFS Pool Options" -msg_zfs_options_name_help="Customize ZFS options for the zpool to be created" +msg_zfs_options_name_help="Customize ZFS options for the pool to be created" ############################################################ FUNCTIONS @@ -748,8 +748,8 @@ dialog_menu_layout() # zfs_create_diskpart $disk $index # -# For each block device to be used in the zpool, rather than just create the -# zpool with the raw block devices (e.g., da0, da1, etc.) we create partitions +# For each block device to be used in the pool, rather than just create the +# pool with the raw block devices (e.g., da0, da1, etc.) we create partitions # so we can have some real swap. This also provides wiggle room incase your # replacement drivers do not have the exact same sector counts. # @@ -905,7 +905,7 @@ zfs_create_diskpart() fi fi - # NB: zpool will use the `zfs#' GPT labels + # NB: ZFS pools will use `zfs#' GPT labels if [ "$ZFSBOOT_BOOT_TYPE" = "BIOS+UEFI" ]; then if [ "$ZFSBOOT_BOOT_POOL" ]; then bootpart=p3 swappart=p4 targetpart=p4 @@ -1006,7 +1006,7 @@ zfs_create_diskpart() f_eval_catch $funcname gpart "$GPART_CREATE" BSD ${disk}s1 || return $FAILURE - # NB: zpool will use s1a (no labels) + # NB: ZFS pools will use s1a (no labels) bootpart=s1a swappart=s1b targetpart=s1d mbrindex=4 # @@ -1594,7 +1594,7 @@ dialog_menu_diskinfo() return $SUCCESS } -dialog_zpool_name() +dialog_pool_name() { local prompt="$* is already taken, please enter a name for the ZFS pool \ (Or confirm using the same name by just pressing enter)" @@ -1639,7 +1639,7 @@ for pool in ${pools}; do f_dprintf "Checking ${pool} against ${ZFSBOOT_POOL_NAME}" if [ "${pool}" = "${ZFSBOOT_POOL_NAME}" ]; then f_dprintf "Pool ${pool} already taken" - ZFSBOOT_POOL_NAME=$(dialog_zpool_name "${ZFSBOOT_POOL_NAME}") + ZFSBOOT_POOL_NAME=$(dialog_pool_name "${ZFSBOOT_POOL_NAME}") break fi done @@ -1771,7 +1771,7 @@ while :; do ?" $msg_pool_name") # Prompt the user to input/change the name for the new pool f_dialog_input input \ - "$msg_please_enter_a_name_for_your_zpool" \ + "$msg_please_enter_a_name_for_your_pool" \ "$ZFSBOOT_POOL_NAME" && ZFSBOOT_POOL_NAME="$input" ;; @@ -1860,7 +1860,7 @@ while :; do ?" $msg_zfs_options_name") # Prompt the user to input/change the pool options f_dialog_input input \ - "$msg_please_enter_options_for_your_zpool" \ + "$msg_please_enter_options_for_your_pool" \ "$ZFSBOOT_POOL_CREATE_OPTIONS" && ZFSBOOT_POOL_CREATE_OPTIONS="$input" ;;