diff options
| author | dteske <dteske@FreeBSD.org> | 2012-09-21 19:03:25 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2012-09-21 19:03:25 +0000 |
| commit | 5bd90f70aeb197b19ce714af4c1a59070b9dc689 (patch) | |
| tree | d041ecdde663dcb11b07368b0990746b6b9decd7 /usr.sbin/bsdconfig/usermgmt | |
| parent | be9906f96c7ede292408ef02eae1e83ce8646c13 (diff) | |
| download | FreeBSD-src-5bd90f70aeb197b19ce714af4c1a59070b9dc689.zip FreeBSD-src-5bd90f70aeb197b19ce714af4c1a59070b9dc689.tar.gz | |
Reverse SVN r240770 -- jilles@ made a suggestion that allowed us to redesign
our embedded rescue environment to support /dev/null making r240770 obsolete.
Reviewed by: jilles, adrian (co-mentor)
Approved by: jilles, adrian (co-mentor)
Diffstat (limited to 'usr.sbin/bsdconfig/usermgmt')
| -rw-r--r-- | usr.sbin/bsdconfig/usermgmt/share/user_input.subr | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr index 7fa9d79..8b356b6 100644 --- a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr +++ b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr @@ -627,7 +627,7 @@ f_dialog_input_change() local secs="$_input" { f_isinteger "$secs" && [ $secs -gt 0 ]; } || secs= _input_date=$( date -j -f "%s" -- "$secs" \ - "+%d %m %Y" 2>&- ) + "+%d %m %Y" 2> /dev/null ) calendar_size=$( f_dialog_calendar_size \ "$DIALOG_TITLE" \ "$DIALOG_BACKTITLE" \ @@ -654,7 +654,7 @@ f_dialog_input_change() _input_time= [ "$secs" ] && _input_time=$( date -j \ - -f %s -- "$_input" "+%H %M %S" 2>&- ) + -f %s -- "$_input" "+%H %M %S" 2> /dev/null ) timebox_size=$( f_dialog_timebox_size \ "$DIALOG_TITLE" \ "$DIALOG_BACKTITLE" \ @@ -682,7 +682,7 @@ f_dialog_input_change() _input=$( date \ -j -f "%d/%m/%Y %T" \ -- "$ret_date $ret_time" \ - +%s 2>&- ) + +%s 2> /dev/null ) f_dprintf "_input=[$_input]" break ;; @@ -852,7 +852,7 @@ f_dialog_input_expire() local secs="$_input" { f_isinteger "$secs" && [ $secs -gt 0 ]; } || secs= _input_date=$( date -j -f "%s" -- "$secs" \ - "+%d %m %Y" 2>&- ) + "+%d %m %Y" 2> /dev/null ) calendar_size=$( f_dialog_calendar_size \ "$DIALOG_TITLE" \ "$DIALOG_BACKTITLE" \ @@ -879,7 +879,7 @@ f_dialog_input_expire() _input_time= [ "$secs" ] && _input_time=$( date -j \ - -f %s -- "$_input" "+%H %M %S" 2>&- ) + -f %s -- "$_input" "+%H %M %S" 2> /dev/null ) timebox_size=$( f_dialog_timebox_size \ "$DIALOG_TITLE" \ "$DIALOG_BACKTITLE" \ @@ -906,7 +906,7 @@ f_dialog_input_expire() _input=$( date \ -j -f "%d/%m/%Y %T" \ -- "$ret_date $ret_time" \ - +%s 2>&- ) + +%s 2> /dev/null ) f_dprintf "_input=[$_input]" break ;; |
