Skip to content

Commit

Permalink
[autoboot] Fix shell banner timeout
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mcb30 committed Nov 5, 2013
1 parent 92c56e1 commit 170d493
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/usr/autoboot.c
Expand Up @@ -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>
Expand Down Expand Up @@ -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 );
}

/**
Expand Down

0 comments on commit 170d493

Please sign in to comment.