Module Name: src Committed By: jakllsch Date: Fri Mar 18 18:21:38 UTC 2011
Modified Files: src/sys/arch/i386/stand/pxeboot: main.c Log Message: Honor bp_timeout even when X86_BP_FLAGS_NOBOOTCONF is set. Or, in other words, bring back the 5 second countdown in pxeboot(8). To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/stand/pxeboot/main.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/pxeboot/main.c diff -u src/sys/arch/i386/stand/pxeboot/main.c:1.27 src/sys/arch/i386/stand/pxeboot/main.c:1.28 --- src/sys/arch/i386/stand/pxeboot/main.c:1.27 Mon Dec 20 01:12:45 2010 +++ src/sys/arch/i386/stand/pxeboot/main.c Fri Mar 18 18:21:38 2011 @@ -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.