diff options
Diffstat (limited to 'sys/arch/amd64/stand/cdboot')
| -rw-r--r-- | sys/arch/amd64/stand/cdboot/cdboot.8 | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/cdboot/conf.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/amd64/stand/cdboot/cdboot.8 b/sys/arch/amd64/stand/cdboot/cdboot.8 index bc9b01d189b..1c0fa077f9a 100644 --- a/sys/arch/amd64/stand/cdboot/cdboot.8 +++ b/sys/arch/amd64/stand/cdboot/cdboot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cdboot.8,v 1.5 2006/10/31 11:29:54 tom Exp $ +.\" $OpenBSD: cdboot.8,v 1.6 2007/04/28 19:23:10 deraadt Exp $ .\" Copyright (c) 2004 Tom Cosgrove .\" Copyright (c) 2003 Matthias Drochner .\" Copyright (c) 1999 Doug White @@ -46,6 +46,10 @@ will look for an configuration file on the CD-ROM. If it finds one, it processes the commands within it. +.Pa boot.conf +processing can be skipped by holding down either Control key as +.Nm +starts. .Pp .Nm then sits in a loop, diff --git a/sys/arch/amd64/stand/cdboot/conf.c b/sys/arch/amd64/stand/cdboot/conf.c index b965dfa23d7..beec5f73b07 100644 --- a/sys/arch/amd64/stand/cdboot/conf.c +++ b/sys/arch/amd64/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 2007/01/02 16:34:16 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.10 2007/04/28 19:23:10 deraadt Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -42,7 +42,7 @@ #include <biosdev.h> #include <dev/cons.h> -const char version[] = "1.08"; +const char version[] = "1.09"; int debug = 1; |