From nobody Thu Dec 26 14:47:49 2024 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 4YJs1K4Sw0z5jBNn; Thu, 26 Dec 2024 14:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YJs1K3nVPz4Ws7; Thu, 26 Dec 2024 14:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735224469; 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=blKXL5fh6taMWLXgn4i87j06ieVDlnxDqIYoTYB6UGI=; b=f8+Qiy5TgpGmA/Ijc+w69GrEXXikmIDt7Gbsha05CvjlooFtB0ScdremMICYm7+Fo//SHk lDQeG95QkE2dt7kt8JzCM5OEsoyqZHtvDxbB81YM1OJtV60hyvXyQxX7Su3b0klsD5ehUN tYTtrICY8GqjDx3kwDxqpF2Hga94k58pyDJ3SwyM2lbbYX36GVa9oXkKIvzx/WAtwtZhco XS7xGoWgTFJnEXoZUh1gkL7X1bXCv1xP3H+KH6BRlxcy1tjcn5xzH4qjfMvWbxfNwA6BBS LrVHX28s0E+RPLrb71RlaWM+LPKSyVjx5zQ/GRSP5hc2qMCO+SxhFHy4NZokTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735224469; 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=blKXL5fh6taMWLXgn4i87j06ieVDlnxDqIYoTYB6UGI=; b=Kptlx1w1Xi4S6FRFH4b641U0AIdwxXH2yoLTUs03Lat5rRy1bWqvPdnfiasWRM6BvM5dN0 nK6UEeSuA3RDdI1An/tfusYEdfuyuBYlksTXnRogUosoVMiSGSDYPKCUiAc12ENujyFUt0 AEg+iivvXNWhnCGyJvAdsRIe1kVwcEtQTJXikZK6UtrNwrtZPxO0Rl0GT9wtpPrwvRQh3h fVmZS36aZVU8s0kR29twd0JmcP6JE8rAj/Zykk3zXl53H3Efg1BIe8jePCOIiolvPcX0v+ xv76HYNZZr9Dj8+scop41AwzzMxd8HjgAdsyl66v/+M4JzRkkCGkQVkai5qCIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735224469; a=rsa-sha256; cv=none; b=WIWCKoVcMmnXgItJaLqDGLDqVXdGYLuOHaFldblO3Gv+8iO9A9nb6Qv8LSID4XJC4+EtSb KHbiBaJa5qX+EmRg8eOq+QbB/ifTaPqymIBOi75BSqgOMFzyYF/lvpWVrPvNz6pSKbRThC lCOBC/4NkiAELPukJomfq40Evb6CxO6a/3jw1pQRmcJxtlD5qGuA1lqFJa9/uUSuEWydXC FR4+77FT4pJz9DJjXuFkbRoQU/N9u6tqmPIaAwA3CwgnRXEiItN3NSsaEXg3TdW6jXRs1n kp7boTSNcgu179pJ6rWPUnQiwegb9oOgnPIEQN0K7YSsirRb9U+0m+ioRet/sw== 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 4YJs1K3Nl9zy4F; Thu, 26 Dec 2024 14:47:49 +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 4BQElnww086869; Thu, 26 Dec 2024 14:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQElnbg086866; Thu, 26 Dec 2024 14:47:49 GMT (envelope-from git) Date: Thu, 26 Dec 2024 14:47:49 GMT Message-Id: <202412261447.4BQElnbg086866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ca7e12f7df22 - main - bsdinstall zfsboot: Add an option to edit the ZFS pool creation options 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca7e12f7df222458ec5cac8009c5b0931fb4a95b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ca7e12f7df222458ec5cac8009c5b0931fb4a95b commit ca7e12f7df222458ec5cac8009c5b0931fb4a95b Author: Craig Leres AuthorDate: 2024-12-26 14:42:11 +0000 Commit: Dimitry Andric CommitDate: 2024-12-26 14:44:24 +0000 bsdinstall zfsboot: Add an option to edit the ZFS pool creation options This allows the default options (-O compress=lz4 -O atime=off) to be overridden, before the ZFS boot pool is created. For example, to set the compression algorithm to something different. Reviewed by: jhb, dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47478 --- usr.sbin/bsdinstall/scripts/zfsboot | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 1d38db2d0f15..45c023b06513 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -324,6 +324,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_zfs_options_name="ZFS Pool Options" +msg_zfs_options_name_help="Customize ZFS options for the zpool to be created" ############################################################ FUNCTIONS @@ -374,6 +377,8 @@ dialog_menu_main() '$msg_swap_mirror_help' 'W $msg_swap_encrypt' '$swapgeli' '$msg_swap_encrypt_help' + 'O $msg_zfs_options_name' '$ZFSBOOT_POOL_CREATE_OPTIONS' + '$msg_zfs_options_name_help' " # END-QUOTE local defaultitem= # Calculated below local hline="$hline_alnum_arrows_punc_tab_enter" @@ -1853,6 +1858,13 @@ while :; do ZFSBOOT_SWAP_ENCRYPTION=1 fi ;; + ?" $msg_zfs_options_name") + # Prompt the user to input/change the pool options + f_dialog_input input \ + "$msg_please_enter_options_for_your_zpool" \ + "$ZFSBOOT_POOL_CREATE_OPTIONS" && + ZFSBOOT_POOL_CREATE_OPTIONS="$input" + ;; esac done