diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-02-16 23:58:06 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-02-16 23:58:06 +0000 |
| commit | e183a6513f0ac55e6525a30cd38c4f9d0bc2241e (patch) | |
| tree | e6f699d92ca3d73eadb697f7ca700e7f285149bd /sys/stand | |
| parent | a921fcdb47616f154d655587ad8f95c2f1dddebf (diff) | |
Cancel the automatic boot when you hold ctrl to skip boot.conf.
"I like it" deraadt "sweet" tedu "love it" marco
Diffstat (limited to 'sys/stand')
| -rw-r--r-- | sys/stand/boot/cmd.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |