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
This commit is contained in:
Pierre Pronchery 2023-10-02 20:34:48 +02:00 committed by Ed Maste
parent a6d202077d
commit ac78e3e9c5

View file

@ -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