From nobody Mon Nov 10 19:00:25 2025 X-Original-To: dev-commits-src-branches@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 4d4zWY3T3kz63GJx; Mon, 10 Nov 2025 19:00:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4zWY2TkXz3LmQ; Mon, 10 Nov 2025 19:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801225; 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=8fzsO8qzw9v7pLxqLPNtFNSGQJCr9fa1q0yJTpL8MQw=; b=NnqrHHt9AjnRfTt7SuUjWe3bkdivjJJrG5zjbRhBQqRluyqS1/50bOODdu/iuk6RDEomB+ rVTTEJjzDdv3GW8MadfmT9wL+fqUCyjHkayVN+70xrJ6a+3N/8wFJt2oKuhznKRVsT73Ck U2HAl+8Z4Seydm+s1zzNZhczvylLCEQc2GhHkyF0KPAZdnYQFf932mavN5iRo2OXeFUUxX 54T+If0W5nhzoGrpvT3NVrvscriAxPhM+TVnfvjCr23cPwdnW50p//SLqSuh0feroHF5aJ 07e2y8SNHNN1IZpockxbksaDsBKVogNwQoUzBsNqT+7gOI53MnuMkH1Ts6Habg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801225; 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=8fzsO8qzw9v7pLxqLPNtFNSGQJCr9fa1q0yJTpL8MQw=; b=e0D6wjVUoWkHqRx5Dq2N/iHelMJJd2BS2Zxo/uqfdbZATmnA6BhorQrKH47B6VpAAJFGeN zpgwoTkpBxiDQR6hY11dv8QRicH8vsub7ME1dZNYxQxf9Jv1at1Dpu23z7+Jwvxk5FliFD RHOagP9NsdmY2WZu045/UfKTYMqk2bJHIhITpRLDtvR67LwmCjlpHm4cua0OLoe5jsfuLL 9AdezakhMk+kBT8KpohreM3NL+okxce60aobfBOPn0qsZX5PIa7lKaEr9KJK4IyubamyCX sLu8YzNn24kZmsDBr3dM/pbi63orEfFqDFSFI/qEPFn5x03lM9KHlStOzl7nhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762801225; a=rsa-sha256; cv=none; b=AXv5vsh4M1HHQfIqD/UHG6S9HdRkd0eyB0Urfp1cuT/mm1aNxCl9c0l5t/gPxDrLzRVk1z fEtOBFUxCyO8wDNWnisL1VWbD4mjk7Ruxe3b6pqa4xJd/Q0WTcmegVK08EHf2VXcm52m8i lxs5hSPWw4Ma9lOmT2qEHPaB+rFO1RSZBhn5e3lx9OaekUTxME8E8qri0Lxd9hIFWwuQR9 39Tf3vn9QViVUSjqmVIO1rKimTCsjZ0MleLHMebTU/jEzmPgHNd72sJIcITJnaCA47IyUr LtXo+XD2gHYQPfJbUVwnh7B1YzyR19fDgrZ3WZ1Ui2WuFYpyRIcqlkKFm1kl5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d4zWY1dJCzVTj; Mon, 10 Nov 2025 19:00:25 +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 5AAJ0POF005082; Mon, 10 Nov 2025 19:00:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJ0Pfp005079; Mon, 10 Nov 2025 19:00:25 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:00:25 GMT Message-Id: <202511101900.5AAJ0Pfp005079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: e55b2f03215e - releng/15.0 - bsdinstall: Fix newfs bsddialog menu List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e55b2f03215ed91df015445c40f9caf052cbb343 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e55b2f03215ed91df015445c40f9caf052cbb343 commit e55b2f03215ed91df015445c40f9caf052cbb343 Author: Ed Maste AuthorDate: 2025-11-07 22:53:01 +0000 Commit: Colin Percival CommitDate: 2025-11-10 19:00:15 +0000 bsdinstall: Fix newfs bsddialog menu The second and third members of struct bsddialog_menuitem are `bool on` and `unsigned int depth`. The newfs dialog options in bsdinstall's partition tool had these two swapped, so the default selection did not work. Approved by: re (cperciva) PR: 290857 Reviewed by: asiciliano Fixes: 50e244964e9b ("bsdinstall/partedit: Replace libdialog with libbsddialog") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53639 (cherry picked from commit 4e36942420712c2ab6ebc2c646e61d47b2b68e7b) (cherry picked from commit 980aa8d4cfdf57a1f99401fa4160c0d82c927d7c) --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 0bcd17950daf..8da85a805545 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -139,16 +139,16 @@ newfs_command(const char *fstype, int use_default) } else if (strcmp(fstype, "freebsd-zfs") == 0) { int i; struct bsddialog_menuitem items[] = { - {"", 0, true, "fletcher4", "checksum algorithm: fletcher4", + {"", true, 0, "fletcher4", "checksum algorithm: fletcher4", "Use fletcher4 for data integrity checking. " "(default)"}, - {"", 0, false, "fletcher2", "checksum algorithm: fletcher2", + {"", false, 0, "fletcher2", "checksum algorithm: fletcher2", "Use fletcher2 for data integrity checking. " "(not recommended)"}, - {"", 0, false, "sha256", "checksum algorithm: sha256", + {"", false, 0, "sha256", "checksum algorithm: sha256", "Use sha256 for data integrity checking. " "(not recommended)"}, - {"", 0, false, "atime", "Update atimes for files", + {"", false, 0, "atime", "Update atimes for files", "Disable atime update"}, }; @@ -188,11 +188,11 @@ newfs_command(const char *fstype, int use_default) strcmp(fstype, "ms-basic-data") == 0) { int i; struct bsddialog_menuitem items[] = { - {"", 0, true, "FAT32", "FAT Type 32", + {"", true, 0, "FAT32", "FAT Type 32", "Create a FAT32 filesystem (default)"}, - {"", 0, false, "FAT16", "FAT Type 16", + {"", false, 0, "FAT16", "FAT Type 16", "Create a FAT16 filesystem"}, - {"", 0, false, "FAT12", "FAT Type 12", + {"", false, 0, "FAT12", "FAT Type 12", "Create a FAT12 filesystem"}, };