diff options
Diffstat (limited to 'usr.sbin/bsdconfig/share/media')
| -rw-r--r-- | usr.sbin/bsdconfig/share/media/any.subr | 6 | ||||
| -rw-r--r-- | usr.sbin/bsdconfig/share/media/ftp.subr | 3 | ||||
| -rw-r--r-- | usr.sbin/bsdconfig/share/media/options.subr | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/usr.sbin/bsdconfig/share/media/any.subr b/usr.sbin/bsdconfig/share/media/any.subr index 3841300..e54af4b 100644 --- a/usr.sbin/bsdconfig/share/media/any.subr +++ b/usr.sbin/bsdconfig/share/media/any.subr @@ -68,10 +68,7 @@ f_media_get_type() local title="$DIALOG_TITLE" btitle="$DIALOG_BACKTITLE" f_dialog_title_restore local prompt="$msg_choose_installation_media_description" - local hline="$hline_choose_help_for_more_information_on_media_types" - local menu_list - - menu_list=" + local menu_list=" '1 $msg_cd_dvd' '$msg_install_from_a_freebsd_cd_dvd' '2 $msg_ftp' '$msg_install_from_an_ftp_server' '3 $msg_ftp_passive' @@ -85,6 +82,7 @@ f_media_get_type() 'A $msg_usb' '$msg_install_from_a_usb_drive' 'X $msg_options' '$msg_view_set_various_media_options' " # END-QUOTE + local hline="$hline_choose_help_for_more_information_on_media_types" local height width rows eval f_dialog_menu_size height width rows \ diff --git a/usr.sbin/bsdconfig/share/media/ftp.subr b/usr.sbin/bsdconfig/share/media/ftp.subr index 5164bf2..e6cea0f 100644 --- a/usr.sbin/bsdconfig/share/media/ftp.subr +++ b/usr.sbin/bsdconfig/share/media/ftp.subr @@ -72,9 +72,7 @@ f_dialog_menu_media_ftp() f_dialog_title "$msg_please_select_a_freebsd_ftp_distribution_site" local title="$DIALOG_TITLE" btitle="$DIALOG_BACKTITLE" f_dialog_title_restore - local prompt="$msg_please_select_the_site_closest_to_you_or_other" - local hline="$msg_select_a_site_thats_close" local menu_list=" '$msg_main_site' 'ftp.freebsd.org' 'URL' '$msg_specify_some_other_ftp_site' @@ -228,6 +226,7 @@ f_dialog_menu_media_ftp() ' $msg_usa #14' 'ftp14.us.freebsd.org' ' $msg_usa #15' 'ftp15.us.freebsd.org' " # END-QUOTE + local hline="$msg_select_a_site_thats_close" local height width rows eval f_dialog_menu_size height width rows \ diff --git a/usr.sbin/bsdconfig/share/media/options.subr b/usr.sbin/bsdconfig/share/media/options.subr index b7bf2e8..b73d004 100644 --- a/usr.sbin/bsdconfig/share/media/options.subr +++ b/usr.sbin/bsdconfig/share/media/options.subr @@ -53,9 +53,10 @@ f_media_options_menu() f_dialog_title "$msg_options_editor" local title="$DIALOG_TITLE" btitle="$DIALOG_BACKTITLE" f_dialog_title_restore - local prompt="" + local prompt= + local menu_list # Calculated below + local defaultitem= local hline="$hline_arrows_tab_enter" - local menu_list cp # # A hack so that the dialogs below are always interactive in a script @@ -66,7 +67,7 @@ f_media_options_menu() unset $VAR_NONINTERACTIVE fi - local defaultitem= + local cp while :; do menu_list="" |
