david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[autoboot] Fix shell banner timeout 

Commit 5e1fa5c ("[parseopt] Add parse_timeout()") introduced a
regression causing the shell banner timeout value (calculated in
milliseconds) to be treated as a timer tick count, resulting in a
timeout of approximately two minutes rather than the intended two
seconds.

Reported-by: Christian Hesse <list@eworm.de>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2013-11-05 16:58:34 +00:00
parent 92c56e129b
commit 170d493bf3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/usr/autoboot.c
View File

@ -35,6 +35,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <ipxe/shell.h>
#include <ipxe/features.h>
#include <ipxe/image.h>
#include <ipxe/timer.h>
#include <usr/ifmgmt.h>
#include <usr/route.h>
#include <usr/dhcpmgmt.h>
@ -468,7 +469,8 @@ static int shell_banner ( void ) {
/* Prompt user */
printf ( "\n" );
return ( prompt ( "Press Ctrl-B for the iPXE command line...",
( BANNER_TIMEOUT * 100 ), CTRL_B ) == 0 );
( ( BANNER_TIMEOUT * TICKS_PER_SEC ) / 10 ),
CTRL_B ) == 0 );
}
/**