From nobody Fri Oct 13 16:23:29 2023 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 4S6Wyp0Kpvz4wSPY; Fri, 13 Oct 2023 16:23:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S6Wyn6rh1z3g6y; Fri, 13 Oct 2023 16:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697214210; 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=qOizcCX+6jKuywu9cUnbe68Tz/fGDjUow8D7Z4aS00I=; b=jrTpaedYIk5TNa6MJetzJcLbdYhHXmQ2e220K00TYEIYH/gLZhlgZPvW+GQBbAS/mvBFp/ GqU9yyVFLxqyhAL1+RrXJ+X0eabT0XQutBz/VcJ0EDQS1c99g6xGf4T9XKCXEG6I6Ow7Rf U9IsZoXQkqebdUBTRX2DpRXi1hniDBYwWe9qHt/LY1UZs7q3pNWPfY3PMr4X7DIlrx5oQe T4yIsHsDYrZJruFKIhfD+JbjDScOsgrdoWT0DD3WQULs6j1RNEmlBMeb/wDltbKxr/WDmF mJOm/3WADPf9wzdw9NmkQRTz53sv7wwHLkAbaEMINb7Q9IvpTPQZ/um7tf/eIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697214210; a=rsa-sha256; cv=none; b=YPqiRspeSgNGTeU1G7URLBgckO/vEpp87xisb8xP5jnkXxs2Z+EDFw8hZyHwUbxKDSAGlv 1BvDsXpngtOk0k0iZhJZgz+OEE7cJGVX9k9LWt7chG+PFPnawHDi0QypohnA0vKg/B3W/n /snVGVoTn6SVVFjjbkW6XK+ex+I3IUUKuOuCMmDp2rAO0ZgXNvxqGIhFTVmcmQmC6jR6KW jIvWVMGe4fFDZRLcYuOmu9lrKZ/TncRIEosoLjgoVhy/MVgnXLcl6axcRTzw4EZ+zEI6ND cHwr1JeKUDdS7jMSKO8UnPrmUx7qFKi8Yvv0i20r68SOvOtr8l9ibO/LHAwmyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697214210; 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=qOizcCX+6jKuywu9cUnbe68Tz/fGDjUow8D7Z4aS00I=; b=nGwJ8UE6YP3oNq8Tw18/atLvgZdPkw+0yhMnjBYVJfsH/n1UTz/T/nVKusRdYLb+B/zmBW +kodywJT7k7F5u5DFMKFjtCQhhuaTI7me025ITyd1Z5tvOqyKyeumC9dPSbhCuvC0oaOiM 3pdyC8BqZMwiMtg8/p5+eyNN9C11kWr0/PD28CMdBehu2kHjLDxfkONMY8iB1iWzmv3m23 gEm0hwfUstLSL3L0IipqBHZxtik4Pf2pJCF1gV6K8BGheJI7EBFDs8d6tvnYj0D8Kv/k8a wBCGya/x6oyaog17QJL+ciNG3odUiBaXx8c2J9h1oEJhJFcR1p2UHFnwwKUeqQ== 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 4S6Wyn5vwBzvgX; Fri, 13 Oct 2023 16:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39DGNTNH081563; Fri, 13 Oct 2023 16:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DGNTqi081560; Fri, 13 Oct 2023 16:23:29 GMT (envelope-from git) Date: Fri, 13 Oct 2023 16:23:29 GMT Message-Id: <202310131623.39DGNTqi081560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ac78e3e9c581 - main - bsdinstall: Add "Finish" button to 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ac78e3e9c581ac3b695adeec1ae312d619a1402b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ac78e3e9c581ac3b695adeec1ae312d619a1402b commit ac78e3e9c581ac3b695adeec1ae312d619a1402b Author: Pierre Pronchery AuthorDate: 2023-10-02 18:34:48 +0000 Commit: Ed Maste CommitDate: 2023-10-13 16:23:01 +0000 bsdinstall: Add "Finish" button to finalconfig This adds a "Finish" button to the finalconfig step, replacing the previous first choice, which was to "apply configuration and exit". The new button is the default action, while the "OK" button is renamed to "Select". Also, if an unknown option is chosen, the code flow prompts the user again instead of exiting. Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42047 --- usr.sbin/bsdinstall/scripts/finalconfig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/finalconfig b/usr.sbin/bsdinstall/scripts/finalconfig index a1c0d804754f..d7c4a1569d39 100755 --- a/usr.sbin/bsdinstall/scripts/finalconfig +++ b/usr.sbin/bsdinstall/scripts/finalconfig @@ -35,9 +35,9 @@ BSDCFG_SHARE="/usr/share/bsdconfig" while true; do exec 5>&1 REVISIT=$(bsddialog --backtitle "$OSNAME Installer" \ - --title "Final Configuration" --no-cancel --menu \ + --title "Final Configuration" --ok-label "Select" \ + --cancel-label "Finish" --default-no --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 \ - "Exit" "Apply configuration and exit installer" \ "Add User" "Add a user to the system" \ "Root Password" "Change root password" \ "Hostname" "Set system hostname" \ @@ -49,6 +49,10 @@ while true; do retval=$? exec 5>&- + if [ $retval -ne $BSDDIALOG_OK ]; then + break + fi + case "$REVISIT" in "Add User") bsdinstall adduser @@ -74,8 +78,5 @@ while true; do "Handbook") bsdinstall docsinstall ;; - *) - break - ;; esac done