Date: Fri, 13 Oct 2023 16:23:29 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ac78e3e9c581 - main - bsdinstall: Add "Finish" button to finalconfig Message-ID: <202310131623.39DGNTqi081560@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ac78e3e9c581ac3b695adeec1ae312d619a1402b commit ac78e3e9c581ac3b695adeec1ae312d619a1402b Author: Pierre Pronchery <pierre@freebsdfoundation.org> AuthorDate: 2023-10-02 18:34:48 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310131623.39DGNTqi081560>