The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d726bc286325dd7093b83c6ebcbaa768c687d825
commit d726bc286325dd7093b83c6ebcbaa768c687d825
Author: Franco Fichtner <fra...@opnsense.org>
AuthorDate: 2025-01-23 11:27:09 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-01-24 19:33:18 +0000
bsdinstall: hook up help line and prompt for ZFS disk selection
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: https://github.com/opnsense/installer/issues/22
Pull Request: https://github.com/freebsd/freebsd-src/pull/1579
---
usr.sbin/bsdinstall/scripts/zfsboot | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot
b/usr.sbin/bsdinstall/scripts/zfsboot
index bfb863f5e7c8..f4670e0d272c 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -688,17 +688,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
