diff options
| author |   sthen <sthen@openbsd.org> | 2009-02-16 23:58:05 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2009-02-16 23:58:05 +0000 |
| commit | 9a2c2bca340d88d16a0bc92c70d129154f4a0186 (patch) | |
| tree | b25d30e4dace60c926f4e0aa00e615e55732baa6 | |
| parent | fix pfctl -v printing of anchors, from camield@. Closes user/6065 (diff) | |
| download | wireguard-openbsd-9a2c2bca340d88d16a0bc92c70d129154f4a0186.tar.xz wireguard-openbsd-9a2c2bca340d88d16a0bc92c70d129154f4a0186.zip | |
Cancel the automatic boot when you hold ctrl to skip boot.conf.
"I like it" deraadt "sweet" tedu "love it" marco
| -rw-r--r-- | sys/arch/amd64/stand/boot/boot.8 | 7 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/boot.8 | 7 | ||||
| -rw-r--r-- | sys/stand/boot/cmd.c | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/sys/arch/amd64/stand/boot/boot.8 b/sys/arch/amd64/stand/boot/boot.8 index 17a16cd2b5c..861ca76cdae 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.10 2007/05/31 19:20:02 jmc Exp $ +.\" $OpenBSD: boot.8,v 1.11 2009/02/16 23:58:05 sthen Exp $ .\" .\" Copyright (c) 1997-2001 Michael Shalayeff .\" All rights reserved. @@ -25,7 +25,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: February 16 2009 $ .Dt BOOT 8 amd64 .Os .Sh NAME @@ -108,7 +108,8 @@ 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 +processing can be skipped, and the automatic boot cancelled, by holding +down either Control key as .Nm starts. .It diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8 index f57f6560da0..34ed527f29f 100644 --- a/sys/arch/i386/stand/boot/boot.8 +++ b/sys/arch/i386/stand/boot/boot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot.8,v 1.47 2007/05/31 19:20:03 jmc Exp $ +.\" $OpenBSD: boot.8,v 1.48 2009/02/16 23:58:05 sthen Exp $ .\" .\" Copyright (c) 1997-2001 Michael Shalayeff .\" All rights reserved. @@ -25,7 +25,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: February 16 2009 $ .Dt BOOT 8 i386 .Os .Sh NAME @@ -108,7 +108,8 @@ 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 +processing can be skipped, and the automatic boot cancelled, by holding +down either Control key as .Nm starts. .It diff --git a/sys/stand/boot/cmd.c b/sys/stand/boot/cmd.c index f59531aaf8b..95a1568c8aa 100644 --- a/sys/stand/boot/cmd.c +++ b/sys/stand/boot/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.59 2007/04/27 10:08:34 tom Exp $ */ +/* $OpenBSD: cmd.c,v 1.60 2009/02/16 23:58:05 sthen Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -108,6 +108,7 @@ read_conf(void) #ifdef CHECK_SKIP_CONF if (CHECK_SKIP_CONF()) { printf("boot.conf processing skipped at operator request\n"); + cmd.timeout = 0; return -1; /* Pretend file wasn't found */ } #endif |