From nobody Mon Nov 10 03:07:16 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 4d4ZMm3TY1z6GTFV; Mon, 10 Nov 2025 03:07:16 +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 4d4ZMm2zXyz3bbM; Mon, 10 Nov 2025 03:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762744036; 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=IY//LLg0lgpDj7as+4d1bZfxk7QyXnolG6ToEaIk4Qg=; b=F3bXorW0i4ZKcB6KLsNK8F+LrR9wbq7EK2Q17RR6gVC9nONX7Cw3X91pTpqB0NAnm5mwXo Haw7+UXR+bFr3HeS1lLkaTUIZBfo3e08NTkk0XQvQ0sj4RskUGWbcTF8Eg83aDZMrgDZ4X wf7dJTysOWCt4HX/3E2d3O3eAXmJS73c7LL8UCRfl2cyjqA/CEV6hyno+vyTviNrWfsSzN dijhw8cbnLEIb7IcKDO+++bmWhxY4eDaJs2xLFEn1/5KNivxBbOOw3/pkGJK+F7nGfsi8U jS4SxxwLECPNt9w6J1tSDAb/jkqUYEOdywajlXnL+irB5+LE+lRh1Sh27RAsGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762744036; 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=IY//LLg0lgpDj7as+4d1bZfxk7QyXnolG6ToEaIk4Qg=; b=pWPSELh1p58uByYvUq8UuelEekqnN3b/vRXnt8s+Cfsme8AclaxIDHItLAkgMdTpmM3f94 qETRyNnUKtYmkA2JMNhEjYBq97Pvc1oJP5PX6ive7QnH8MsA+XcTXrKD4Bo2V7C1n33rfc qpfe0Jp93xrvrrRA63NV86k68W8ulUjsXh8gOnH+8c0f6rJ6m2lVsUwUvYhqkhONkG5WUV YJXnPQqyjvIf+HpyuFsDLgiRCPCNszTKuqJbDZRbjnAiJOjTI42Pi++4CgG2x3jBquOEgQ Ad+cAW74/RCNPOUF5ARld04iPCMjokgavWwvkEqej1dQVXAzBeA3DSS0gbaF3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762744036; a=rsa-sha256; cv=none; b=blNF1WI4FathP+gfxu+zVGTKgS+Vi8FUq71FNNpSEccwQfe3q+ZUWXWQEoIOzbi4nJdBj7 AVz+SfYZry6H0JwuT8VX/Dfbvb/aPb1j3n2gdMMe8fUcFKGP45hzFXuC20oFc/r+UpiBlL lUMfXInnveVKqYjCGalLSa8S66qCAFbBI3hfdCclpBHBPXJ/YH6nLVRtrAVxr7XDpDF9hH 2YV4sRB9JrSSDzztdlH+Pq5R5KWlrM/thyEczWtXA+do0jK5+cxhq+g2Bgmq9xYyYYzp3a 8VXdCxOZ+2frO7DnWz7/KxOopBWNZaBOP7n8579v5GnOAueUNkPAtYi9YYnLzQ== 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 4d4ZMm2TGBz10Fs; Mon, 10 Nov 2025 03:07:16 +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 5AA37G6E010104; Mon, 10 Nov 2025 03:07:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AA37GdC010101; Mon, 10 Nov 2025 03:07:16 GMT (envelope-from git) Date: Mon, 10 Nov 2025 03:07:16 GMT Message-Id: <202511100307.5AA37GdC010101@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: 980aa8d4cfdf - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 980aa8d4cfdf57a1f99401fa4160c0d82c927d7c Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=980aa8d4cfdf57a1f99401fa4160c0d82c927d7c commit 980aa8d4cfdf57a1f99401fa4160c0d82c927d7c Author: Ed Maste AuthorDate: 2025-11-07 22:53:01 +0000 Commit: Ed Maste CommitDate: 2025-11-10 03:06:53 +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) --- 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"}, };