diff options
| author | dteske <dteske@FreeBSD.org> | 2013-07-05 16:00:01 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2013-07-05 16:00:01 +0000 |
| commit | 0ac55ea171e6d82b0acc861ebcb19fb4db4958c4 (patch) | |
| tree | 20324385a5f53dae148a2e6fa863df76ea68f69d /usr.sbin/bsdconfig/startup/share | |
| parent | 1523d4a961431261ec396302c4112265ef2003c7 (diff) | |
| download | FreeBSD-src-0ac55ea171e6d82b0acc861ebcb19fb4db4958c4.zip FreeBSD-src-0ac55ea171e6d82b0acc861ebcb19fb4db4958c4.tar.gz | |
Use f_show_msg() instead of f_dialog_msgbox() where appropriate. The main
difference between these two functions:
Usage: f_show_msg() $format_string [ $format_args ... ]
Usage: f_dialog_msgbox() $text [ $hline ]
The former lends itself well to displaying the $msg_* i18n text, prompts,
etc. While the latter is better for text you do not control (error strings
captured as a response from external commands) -- or if you have to control
the hline.
Diffstat (limited to 'usr.sbin/bsdconfig/startup/share')
| -rw-r--r-- | usr.sbin/bsdconfig/startup/share/rcconf.subr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdconfig/startup/share/rcconf.subr b/usr.sbin/bsdconfig/startup/share/rcconf.subr index bb8237f..8016037 100644 --- a/usr.sbin/bsdconfig/startup/share/rcconf.subr +++ b/usr.sbin/bsdconfig/startup/share/rcconf.subr @@ -469,14 +469,14 @@ f_dialog_input_rcvar() # Check for invalid entry (1of2) if ! echo "$_input" | grep -q "^[[:alpha:]_]"; then - f_dialog_msgbox "$msg_rcvar_must_start_with" + f_show_msg "$msg_rcvar_must_start_with" continue fi # Check for invalid entry (2of2) if ! echo "$_input" | grep -q "^[[:alpha:]_][[:alnum:]_]*$" then - f_dialog_msgbox "$msg_rcvar_contains_invalid_chars" + f_show_msg "$msg_rcvar_contains_invalid_chars" continue fi |
