diff options
Diffstat (limited to 'usr.sbin/bsdconfig/startup')
| -rwxr-xr-x | usr.sbin/bsdconfig/startup/misc | 2 | ||||
| -rw-r--r-- | usr.sbin/bsdconfig/startup/share/rcconf.subr | 5 | ||||
| -rw-r--r-- | usr.sbin/bsdconfig/startup/share/rcedit.subr | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/usr.sbin/bsdconfig/startup/misc b/usr.sbin/bsdconfig/startup/misc index c964129806eb..6e33462456ff 100755 --- a/usr.sbin/bsdconfig/startup/misc +++ b/usr.sbin/bsdconfig/startup/misc @@ -303,7 +303,7 @@ dialog_input_value() local prompt="$1" _input="$2" f_dialog_title "$msg_value_required" - _input=$( f_dialog_input "$prompt" "$_input" "$hline_alnum_tab_enter" ) + f_dialog_input _input "$prompt" "$_input" "$hline_alnum_tab_enter" local retval=$? f_dialog_title_restore diff --git a/usr.sbin/bsdconfig/startup/share/rcconf.subr b/usr.sbin/bsdconfig/startup/share/rcconf.subr index 1c641378ebff..ed8553ab9021 100644 --- a/usr.sbin/bsdconfig/startup/share/rcconf.subr +++ b/usr.sbin/bsdconfig/startup/share/rcconf.subr @@ -454,9 +454,8 @@ f_dialog_input_rcvar() while :; do # Return if user either pressed ESC or chosen Cancel/No - _input=$( f_dialog_input "$msg_please_enter_rcvar_name" \ - "$_input" "$hline_alnum_tab_enter" - ) || return + f_dialog_input _input "$msg_please_enter_rcvar_name" \ + "$_input" "$hline_alnum_tab_enter" || return # Check for invalid entry (1of2) if ! echo "$_input" | grep -q "^[[:alpha:]_]"; then diff --git a/usr.sbin/bsdconfig/startup/share/rcedit.subr b/usr.sbin/bsdconfig/startup/share/rcedit.subr index cb4a4116961e..64ee1ccf0d84 100644 --- a/usr.sbin/bsdconfig/startup/share/rcedit.subr +++ b/usr.sbin/bsdconfig/startup/share/rcedit.subr @@ -68,9 +68,8 @@ f_dialog_rcedit() fi # Return if user has either pressed ESC or chosen Cancel/No - _input=$( f_dialog_input "$msg" "$_input" \ - "$hline_alnum_punc_tab_enter" - ) || return + f_dialog_input _input "$msg" "$_input" \ + "$hline_alnum_punc_tab_enter" || return # Return if the value has not changed from current local cur_val="$( f_sysrc_get "$var" )" |