diff options
Diffstat (limited to 'sys/arch/amd64/stand/boot')
| -rw-r--r-- | sys/arch/amd64/stand/boot/boot.8 | 7 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/boot/conf.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/arch/amd64/stand/boot/boot.8 b/sys/arch/amd64/stand/boot/boot.8 index 65acff5a2bd..384b918944f 100644 --- a/sys/arch/amd64/stand/boot/boot.8 +++ b/sys/arch/amd64/stand/boot/boot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot.8,v 1.7 2006/05/15 09:10:52 jmc Exp $ +.\" $OpenBSD: boot.8,v 1.8 2007/04/28 19:23:10 deraadt Exp $ .\" .\" Copyright (c) 1997-2001 Michael Shalayeff .\" All rights reserved. @@ -106,6 +106,11 @@ This file may contain any commands .Nm accepts at the interactive prompt. Though default settings usually suffice, they can be changed here. +.Pp +.Pa boot.conf +processing can be skipped by holding down either Control key as +.Nm +starts. .It The header line .Pp diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c index 96cf66084fd..c7af2054447 100644 --- a/sys/arch/amd64/stand/boot/conf.c +++ b/sys/arch/amd64/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.10 2007/01/02 16:34:16 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.11 2007/04/28 19:23:10 deraadt Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -42,7 +42,7 @@ #include <biosdev.h> #include <dev/cons.h> -const char version[] = "2.14"; +const char version[] = "2.15"; int debug = 1; |