Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386/stand/boot Honor bp_timeout even if someone se...
details: https://anonhg.NetBSD.org/src/rev/b21aa1924c3e
branches: trunk
changeset: 763408:b21aa1924c3e
user: jakllsch <jakllsch%NetBSD.org@localhost>
date: Fri Mar 18 18:24:09 2011 +0000
description:
Honor bp_timeout even if someone sets X86_BP_FLAGS_NOBOOTCONF.
diffstat:
sys/arch/i386/stand/boot/boot2.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (23 lines):
diff -r 99df11b77193 -r b21aa1924c3e sys/arch/i386/stand/boot/boot2.c
--- a/sys/arch/i386/stand/boot/boot2.c Fri Mar 18 18:21:38 2011 +0000
+++ b/sys/arch/i386/stand/boot/boot2.c Fri Mar 18 18:24:09 2011 +0000
@@ -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.
Home |
Main Index |
Thread Index |
Old Index