diff options
| author | Alfonso S. Siciliano <asiciliano@FreeBSD.org> | 2022-05-24 12:04:24 +0000 |
|---|---|---|
| committer | Alfonso S. Siciliano <asiciliano@FreeBSD.org> | 2022-05-24 12:20:22 +0000 |
| commit | 6368dcb29228dd8e18d50c54c3ca1596262d4676 (patch) | |
| tree | 180acb36a073874af675e59c58581c0ca37600a0 /usr.sbin | |
| parent | 477204e70b658c518064a02203a2050d5a0841be (diff) | |
| download | src-6368dcb29228dd8e18d50c54c3ca1596262d4676.tar.gz src-6368dcb29228dd8e18d50c54c3ca1596262d4676.zip | |
bsdinstall hostname: Replace dialog with bsddialog
Replace (LGPL) dialog utility with (BSD-2-Clause) bsddialog utility.
Add --hline info because bsddialog requires TAB to switch the focus on
buttons for an inputbox, dialog differs.
Delete f_dialog_inputbox_size() using libbsddialog autosizing.
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D35285
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/hostname | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.sbin/bsdinstall/scripts/hostname b/usr.sbin/bsdinstall/scripts/hostname index b151ef15c690..23adbe68ead0 100755 --- a/usr.sbin/bsdinstall/scripts/hostname +++ b/usr.sbin/bsdinstall/scripts/hostname @@ -48,6 +48,8 @@ f_include $BSDCFG_SHARE/dialog.subr ############################################################ GLOBALS +: ${BSDDIALOG_CANCEL=1} + # # Strings that should be moved to an i18n file and loaded with f_include_lang() # @@ -71,21 +73,17 @@ SET_HOSTNAME='hostname -s "%s"' dialog_hostname() { local prompt="$msg_please_choose_a_hostname" - local hline= + local hline="Use TAB and Enter to select $msg_ok" local value="$*" - local height width - f_dialog_inputbox_size height width \ - "$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$prompt" "$value" "$hline" - - $DIALOG \ + bsddialog \ --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ --hline "$hline" \ --ok-label "$msg_ok" \ --no-cancel \ --inputbox "$prompt" \ - $height $width "$value" \ + 0 56 "$value" \ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD } @@ -101,7 +99,7 @@ f_dialog_backtitle "$msg_freebsd_installer" # Get user input # HOSTNAME=$( dialog_hostname "$HOSTNAME" ) -[ $? -eq $DIALOG_CANCEL ] && exit 1 +[ $? -eq $BSDDIALOG_CANCEL ] && exit 1 # # Store the user's choice |