Skip to content

Commit

Permalink
bsdinstall: hook up help line and prompt for ZFS disk selection
Browse files Browse the repository at this point in the history
Previously we were passing the wrong variable names for the prompt and
help line, so the intended action wasn't clear to the user.

Reviewed by:	jhb, markj
MFC after:	3 days
See also:	opnsense/installer#22
Pull Request:	freebsd/freebsd-src#1579

(cherry picked from commit d726bc286325dd7093b83c6ebcbaa768c687d825)
  • Loading branch information
fichtner committed Feb 3, 2025
1 parent ff21b77 commit 8126a94
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions usr.sbin/bsdinstall/scripts/zfsboot
Original file line number Diff line number Diff line change
Expand Up @@ -689,17 +689,17 @@ dialog_menu_layout()
done

eval f_dialog_checklist_size height width rows \
\"\$title\" \"\$btitle\" \"\$prompt\" \
\"\$hline\" $disk_check_list
\"\$title\" \"\$btitle\" \"\$disk_prompt\" \
\"\$disk_hline\" $disk_check_list

selections=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--separate-output \
--hline \"\$hline\" \
--hline \"\$disk_hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_back\" \
--checklist \"\$prompt\" \
--checklist \"\$disk_prompt\" \
$height $width $rows \
$disk_check_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
Expand Down

0 comments on commit 8126a94

Please sign in to comment.