Module Name: src
Committed By: jakllsch
Date: Fri Mar 18 18:24:09 UTC 2011
Modified Files:
src/sys/arch/i386/stand/boot: boot2.c
Log Message:
Honor bp_timeout even if someone sets X86_BP_FLAGS_NOBOOTCONF.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/stand/boot/boot2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.52 src/sys/arch/i386/stand/boot/boot2.c:1.53
--- src/sys/arch/i386/stand/boot/boot2.c:1.52 Sun Feb 6 23:16:05 2011
+++ src/sys/arch/i386/stand/boot/boot2.c Fri Mar 18 18:24:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.52 2011/02/06 23:16:05 jmcneill Exp $ */
+/* $NetBSD: boot2.c,v 1.53 2011/03/18 18:24:09 jakllsch Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -311,8 +311,12 @@
default_filename = DEFFILENAME;
#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.
