From nobody Tue Feb 04 17:30:23 2025 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 4YnVkS62sbz5n81H; Tue, 04 Feb 2025 17:30:24 +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 4YnVkR4psGz3Y7V; Tue, 04 Feb 2025 17:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738690223; 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=uteB/ZTBz2PXFPC/LMaykclLhUTAemIUA5MySvtOd6A=; b=XiSmH9zAvt7WYpb1hRcNTCeyEZDkVKDg4QtlaQb72ffJ8tWn0+T+h2crZHMhMey6vdcwIc iZ6n794j1I8O8W1am5wfkrLLq0QU+nXa2Hlkx8OCmC6r0tdgaG1CWoNEYU7gUE/Qrm7BzC FPX6UDWtvPiv4ZQ5Ua38bb9dH54IX5tyCUutgwoTn20Zim8CB1puhvWCOJpnYxR27e/oHK DOFcDDBMufTOTtxDM3SP7ilvx2HkgQxhPOcVaeLkMYgh9WfZ9sfj0XSqmwJqMESaahIY6B 77HSoB5CO/upmbSDNfMQOdSwiFaWrw2rfTogI1qGt9wMvgM0MEesTe9QL30x2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738690223; 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=uteB/ZTBz2PXFPC/LMaykclLhUTAemIUA5MySvtOd6A=; b=pv1wI2Cor8u61uL0i5zaXycnwpKHTNbJ7vQEWYHoCk9AfEWAcVxdeSFUjBqEM2/XTXJzFc /odfncpqylFoy2nVWqcFc+PqFtFxSxnaQaJdzUEXEcfLIAVEHd8f++eybrKV0uXDqpXuy8 eA8B5XUgj38mfmESZKqYRMDBm4paw84KQcytJqfqHQf4dAFYOmr82ZGmQiRM1igzKnfFmI 1UgRK+dpVN7+kiS+/rXvb5084R49rA+FCFzA70aTRqC2c0VR+86woJo7W7hNSZhFG+HhM6 c/M4f02ysqBvv8ktghmObytrQ3bk9sszyi1n/vdph/SxehW5L5bNB6tm0dTH2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738690223; a=rsa-sha256; cv=none; b=oMv6ND4i+lJ/43YRgqOH3EC0Wi4A2xmug2/Ia92VUbt4OfwSkxu3YPz7zsF730wq5qjGO1 mLa/VC8euQOsd3FwuGiHiyf0YTu3N11aheDvuKtZtGumjmQ+uiXRfdb4G8PGEFsSY91Sz1 mGCfUEaMF7+0w99oh8Nlkwh8jVfX+HQK5dTgikMzVZkEwRJy0+A2GNv1nsbJUgdche3hzP 2C+9olIyb050YsIKHx4/Rqy2XgyCx2vF+bTacOMTRHarpkjgTwkvEGhCCH2x5gRNhzR3TP fQm/O7LTneJE+4yHXzpuNnWuGZjVq0V1LCSDigLi4HYrMUm5NCR6/SEIcF0GYg== 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 4YnVkR4GxfzxS; Tue, 04 Feb 2025 17:30:23 +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 514HUNQU014898; Tue, 4 Feb 2025 17:30:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514HUNUc014895; Tue, 4 Feb 2025 17:30:23 GMT (envelope-from git) Date: Tue, 4 Feb 2025 17:30:23 GMT Message-Id: <202502041730.514HUNUc014895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 97350075fe3a - main - bsdinstall: Switched back to amended single-button finalconfig 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97350075fe3a7951b7ef86a63c0a3f033dc03118 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=97350075fe3a7951b7ef86a63c0a3f033dc03118 commit 97350075fe3a7951b7ef86a63c0a3f033dc03118 Author: Jessica Clarke AuthorDate: 2025-02-04 17:27:00 +0000 Commit: Jessica Clarke CommitDate: 2025-02-04 17:27:00 +0000 bsdinstall: Switched back to amended single-button finalconfig Commit ac78e3e9c581 ("bsdinstall: Add "Finish" button to finalconfig") removed the Exit entry from the menu, renamed OK to Select and added a Finish in place of the old Exit entry. On the surface this seemed like a good idea, as at a glance OK wasn't clear that it was selecting an entry rather than just closing the box, Exit isn't the most obvious term to use for proceeding through the installer without doing anything, and it separated out the different cases of "do something extra" and "continue". However, because bsddialog (and dialog) keep a menu entry highlighted even when the Cancel (in this case, Finish) button is selected, this now looks even more confusing, with users easily believing that they are about to select the Add User option (being either surprised when it doesn't actually do that, or being confused about how to not select it). Instead, go back to the old scheme that fits more with bsddialog's supported functionality but tweak it to try and improve on the confusing UI/UX from the past. Specifically, the UI changes compared with the original version are as follows: 1. The OK button is renamed to Select, as in the current UI 2. The Exit entry is renamed to Finish, mirroring the label of the button in the current UI that it replaces This partially reverts commit ac78e3e9c581ac3b695adeec1ae312d619a1402b. Reviewed by: khorben_defora.org Differential Revision: https://reviews.freebsd.org/D47229 --- usr.sbin/bsdinstall/scripts/finalconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/finalconfig b/usr.sbin/bsdinstall/scripts/finalconfig index 68ee16a5330d..c7814a3b6a45 100755 --- a/usr.sbin/bsdinstall/scripts/finalconfig +++ b/usr.sbin/bsdinstall/scripts/finalconfig @@ -36,8 +36,9 @@ while true; do exec 5>&1 REVISIT=$(bsddialog --backtitle "$OSNAME Installer" \ --title "Final Configuration" --ok-label "Select" \ - --cancel-label "Finish" --default-no --menu \ + --no-cancel --menu \ "Setup of your $OSNAME system is nearly complete. You can now modify your configuration choices. After this screen, you will have an opportunity to make more complex changes using a shell." 0 0 0 \ + "Finish" "Apply configuration and exit installer" \ "Add User" "Add a user to the system" \ "Root Password" "Change root password" \ "Hostname" "Set system hostname" \ @@ -55,6 +56,9 @@ while true; do fi case "$REVISIT" in + "Finish") + break + ;; "Add User") bsdinstall adduser ;;