diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-04-27 10:08:35 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-04-27 10:08:35 +0000 |
| commit | a6fbb0d5794262d14d0b4dd073621abe323c5e1f (patch) | |
| tree | 16bdf3529a71b9d93637ca61b4b32ad4221efd3d /sys/arch/i386/stand/cdboot/cdboot.8 | |
| parent | 0cf9d988c4916ba3299a05e1f4f8fb46b8f2c7ff (diff) | |
Check for Control key held down when starting, and don't read boot.conf
if it is. This gives a way to recover from "switching to com0" when
there's no serial cable handy.
Bump version numbers.
A similar change will be made to amd64 boot soon.
ok toby@ deraadt@
Diffstat (limited to 'sys/arch/i386/stand/cdboot/cdboot.8')
| -rw-r--r-- | sys/arch/i386/stand/cdboot/cdboot.8 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/i386/stand/cdboot/cdboot.8 b/sys/arch/i386/stand/cdboot/cdboot.8 index e265dddc4c5..eb9525a08a3 100644 --- a/sys/arch/i386/stand/cdboot/cdboot.8 +++ b/sys/arch/i386/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/27 10:08:34 tom 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, |