diff options
| author | Franco Fichtner <franco@opnsense.org> | 2025-01-23 11:27:09 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2025-01-28 16:00:12 +0000 |
| commit | be53f732663cbe9c1c4f3e7310cfa82bbe32da90 (patch) | |
| tree | cdf5ed72d5fb5f27df92efcd6566e44b54f5e49d | |
| parent | 3ba946aebf747e12da4fb22ee0e45ee0e3a233ee (diff) | |
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
(cherry picked from commit d726bc286325dd7093b83c6ebcbaa768c687d825)
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/zfsboot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 4f3c9719dde0..2b118e33ba36 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -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 |