diff options
| author | dteske <dteske@FreeBSD.org> | 2013-06-08 21:45:32 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2013-06-08 21:45:32 +0000 |
| commit | 57d593bf7923dac90cb7695cf9480910452808c2 (patch) | |
| tree | 3c3e59e603b7f04852c3dde5b0cd5865698d57e9 | |
| parent | cf6da5ffd10b0bbe5a90f0f4856fbe82b6d25e41 (diff) | |
| download | FreeBSD-src-57d593bf7923dac90cb7695cf9480910452808c2.zip FreeBSD-src-57d593bf7923dac90cb7695cf9480910452808c2.tar.gz | |
Fix a bug introduced with r251190, in which a small hunk was forgotten in
the performance conversion process.
The effect of this was the following error when selecting the menu
"Startup"->"View/Edit Startup Configuration"->"Add New"->"Add From List":
[: -eq: unexpected operator
By running `bsdconfig -d' as root to enable debugging, this turns into:
DEBUG: f_getvar: var=[text] value=[
Error: Expected a number for token 4 of --menu.
Use --help to list options.] r=0
[: -eq: unexpected operator
Indicating that the fourth token for --menu which should be $height was
instead a string (the first item of $menu_list) because it was using the
old size-calculation method and $size was now null (needed to use instead
the new size variables of $height $width and $rows).
| -rw-r--r-- | usr.sbin/bsdconfig/startup/share/rcconf.subr | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/bsdconfig/startup/share/rcconf.subr b/usr.sbin/bsdconfig/startup/share/rcconf.subr index 07a9de2..72d94cb 100644 --- a/usr.sbin/bsdconfig/startup/share/rcconf.subr +++ b/usr.sbin/bsdconfig/startup/share/rcconf.subr @@ -437,7 +437,8 @@ f_dialog_input_rclist() --ok-label \"\$msg_ok\" \ --cancel-label \"\$msg_cancel\" \ ${SHOW_DESC:+--item-help} \ - --menu \"\$prompt\" $size \ + --menu \"\$prompt\" \ + $height $width $rows \ $menu_list \ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) |
