[src/trunk]: src/sys/arch/i386/stand/pxeboot Honor bp_timeout even when X86_B...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/99df11b77193
branches:  trunk
changeset: 763407:99df11b77193
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Mar 18 18:21:38 2011 +0000

description:
Honor bp_timeout even when X86_BP_FLAGS_NOBOOTCONF is set.
Or, in other words, bring back the 5 second countdown in pxeboot(8).

diffstat:

 sys/arch/i386/stand/pxeboot/main.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r be2d4ee68664 -r 99df11b77193 sys/arch/i386/stand/pxeboot/main.c
--- a/sys/arch/i386/stand/pxeboot/main.c        Fri Mar 18 17:46:26 2011 +0000
+++ b/sys/arch/i386/stand/pxeboot/main.c        Fri Mar 18 18:21:38 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.27 2010/12/20 01:12:45 jakllsch Exp $       */
+/*     $NetBSD: main.c,v 1.28 2011/03/18 18:21:38 jakllsch Exp $       */
 
 /*
  * Copyright (c) 1996
@@ -136,8 +136,11 @@
                                 & X86_BP_FLAGS_NOMODULES);
 
 #ifndef SMALL
-       if (!(boot_params.bp_flags & X86_BP_FLAGS_NOBOOTCONF))
+       if (!(boot_params.bp_flags & X86_BP_FLAGS_NOBOOTCONF)) {
                parsebootconf(BOOTCONF);
+       } else {
+               bootconf.timeout = boot_params.bp_timeout;
+       }
 
        /*
         * If console set in boot.cfg, switch to it.