From nobody Wed Nov 12 15:48:14 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 4d678t3lcsz6G9sp; Wed, 12 Nov 2025 15:48:14 +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 4d678t32nNz3F0M; Wed, 12 Nov 2025 15:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762962494; 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=SndZElk+POPJhG+bUjWIG/AKw24KpE9f2254WIis2Rw=; b=ttmbkZdRjWSMHuwVD5JmkjT+g2Ue+00nZ6p1n/nKdD+DAI1cez+TlPFy8fI8F3OIrZM7gg R9drmXSPwuCEikCweJcCZnn4yCQX96YgVSdCfSnjNSmD28wkOCAqQiO8yIwWbsxrsPIzPX Jwi0TicTOCp++1FZY1L+B3JvjZSFI6skdAWT/ZYTainBTQUBAA8YDyKcxZF8xlaX3L2znO NAC6qlYsSzfKGW6dxMnGzvyX2UNSUXDhpiULxNvmiSLlzq5LSnahatPb+s3y2+s1Q9FKFz qafTPURllYRCURZ9bAZOumvauWOm64XK0Z6Ec3XS4TkhJ5TBHXMt6BYeqqrQqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762962494; 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=SndZElk+POPJhG+bUjWIG/AKw24KpE9f2254WIis2Rw=; b=tuFVM7pM1ObU9wxkJuC/soa68JoFMrNvDL6yIA4ibQIOOG1Enual06S46HNxB/val6iXYp lIfGY059B9SKh4vuvB8dLz66NJDtNdXz43+0KnkviR1QhL1fKY5dpRiTZx1UhBcW/mXtV3 gMWOir7olEqkWMS6ZXteS+sPI3Y5FCGnyxsGN61NRz1FLyv/ifI+XqVmewnXZVtBqAXAnY 4TtIllRLp67ku/Saj6UtsQO5ih+wBfbp7Y7r+dhQ6TCnSFnryCzTN6GKDvaR9jKCqcQ8Uq 90EvSKMti/78wrQT9uwozcnR6iOsCYKuzvVyuyA33xKZE4u4gUjY1IbYqLh5wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762962494; a=rsa-sha256; cv=none; b=uo3n7JLuZsRMuE4CDdkBqTd/YwHatPZi8qvm2/McOYQESUEROTeNqLt9WydyOvvL09KPqy g7n8uYYIuu8RpzVQTx/AdUEE5lF6xx6BwcygMeTf4QL1aN2ifwpkddKFnmn0ztD59W3iJw aE4y2NqLjN0dL7if2Ap3ayRxavcZOq+wHX1t5csWtKeIbjOE+XW1dXejm0AN6Q/Q/NctBK jdzqwNeYfnuFkt7oFNIVuv+A1UZ9AWXoIiVQbqQbDAUqwpgTle/38mjl1uYeeeRvnGd6xJ Q0G/rNIAy/M2vddTxczoRhPSfNbyFHZFIq7vgVWFqwURYPrhxBo/ic48sTg6sg== 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 4d678t2Nq3zhN0; Wed, 12 Nov 2025 15:48:14 +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 5ACFmEIq059098; Wed, 12 Nov 2025 15:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACFmEu0059095; Wed, 12 Nov 2025 15:48:14 GMT (envelope-from git) Date: Wed, 12 Nov 2025 15:48:14 GMT Message-Id: <202511121548.5ACFmEu0059095@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3ced4a2b482f - stable/14 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3ced4a2b482f50672bba26de3f26273a73f75b9c Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3ced4a2b482f50672bba26de3f26273a73f75b9c commit 3ced4a2b482f50672bba26de3f26273a73f75b9c Author: Ed Maste AuthorDate: 2025-11-07 22:53:01 +0000 Commit: Ed Maste CommitDate: 2025-11-12 15:47:42 +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. 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 5c4ec5706c1c..b598d4cb8bcb 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"}, };