From nobody Mon Dec 30 19:20:59 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 4YMQtg2Nv3z5hdJ7; Mon, 30 Dec 2024 19:20:59 +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 4YMQtg1xPyz471t; Mon, 30 Dec 2024 19:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735586459; 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=T527QbRPlgTESnqGavE+WZgCtkflQ6tf7r1dXqhFu98=; b=v/e1yVIMi76EIh5Tcb/OXmUSpHgNNZ/QgnO6x2egrpdGHryCPiCruey/xqXhpp9dHSt7ns UFLm/eMoLgAifnnpJDnl+9ibXBDdcrWa8NlbUNSOtLEH+PyTbu0p4qKt/BWqmx8kWNlgEy bua4fwWRxK2By3K+zsKkO9Sw1iXQ6J/mSdH0/jUEZRn1hO3MEbgWHnwBqtEkjPBbuhPQ0h 4xFdBuPq+KGOdMt/Y+QxwxNPxrfqzcAkYPEJbzLcCjuJNEl7XdsEBlC/ue8BTEkLhM7WQY MSYE9q9JoQsNHJ+GUImo4FNNefbEhq4UhzeYGhHCkhHCXQruqTatIDbfsmNmyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735586459; 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=T527QbRPlgTESnqGavE+WZgCtkflQ6tf7r1dXqhFu98=; b=jeqWHk+68/2hxwGH7oNZIHpaRYF+xE0l8/8XUUjSzIK86ywXQqAlMVUprIrQPNgYOg/bu4 slDUaR6wPfgQer3Ulhpz7ulbgLqH8tLpxdvy5q5uNnCVeuSRbd+mK5wy1655YiM+w1v/aY +6XBRqNHHvHLLOe3qqojfa1BEigs7IroG7cN8JWPRHagYQVIzYIuZgDglOQvRRNuFlo8rm vCus2q8qvMq12+0tZrKpM0ZyOg+wLsAVcRa+ehl8OwH1UevhTluT0VnAH9GDyy2xfKVKPG mqI1236W5S/OSQVvptsd+hIJwRoB7AaIFyBtMI9NMG614jc+AMusHiFK3Avvbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735586459; a=rsa-sha256; cv=none; b=Hz1kKTJcDp0NWA5aBzGfQDi2s+4vepl26JliSitpjJEvAO5afZTEIJIWoNuoWOi2sqH3Nu x/8Vn2aiHvsoQarRbF/hJQxUHgz4cML5UK2hPhFwXXZZvyD9NcJlfJwkRaGGfO05hPk5lX 9iYV9yIjkyq0ejGikcRoTflse3WzS2a4o80EGvym34Cb/Efqys9rDvZauXsyrd0B+kbptv oa+rlioWq7a66oG+hIUmdFd4l1uEMEl6mVri0dtcwhAGDSG6+1GqnAxKFK7Er19TnY3aki tSPi7+MEyjzSEVNaMXf99a8aSHz0xwP/kJfw5ZGJhs35DmfIriGR57eO6mvlhQ== 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 4YMQtg1Y1Bz16Hp; Mon, 30 Dec 2024 19:20:59 +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 4BUJKxE1063684; Mon, 30 Dec 2024 19:20:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUJKxAV063681; Mon, 30 Dec 2024 19:20:59 GMT (envelope-from git) Date: Mon, 30 Dec 2024 19:20:59 GMT Message-Id: <202412301920.4BUJKxAV063681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7d6ae5874ede - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d6ae5874ede58771d8979049bf742086658cf82 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7d6ae5874ede58771d8979049bf742086658cf82 commit 7d6ae5874ede58771d8979049bf742086658cf82 Author: Craig Leres AuthorDate: 2024-12-26 14:42:11 +0000 Commit: Dimitry Andric CommitDate: 2024-12-30 19:20:13 +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 (cherry picked from commit ca7e12f7df222458ec5cac8009c5b0931fb4a95b) --- 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 e7fd59d5c8b3..93d9490f972a 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