diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2004-03-10 23:02:55 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2004-03-10 23:02:55 +0000 |
| commit | 269e9b0ceb4a217d7841ca9a9f66e153e6d6e863 (patch) | |
| tree | 8a958e6662d220297278df0c8b847dea06484b5f /sys/arch/i386 | |
| parent | c70330c0f96146989bd785f685bb0199742c1a40 (diff) | |
Ensure that we obey a user's ddb> boot reboot command even if the system
is cold (during startup).
This adds RB_USERREQ to sys/reboot.h, uses it in the ddb commands, and
ensures that */*/machdep.c:boot() won't set RB_HALT when cold if this
flag is set.
ok deraadt@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 1b227149c41..aca1e054107 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.284 2004/02/27 21:46:44 grange Exp $ */ +/* $OpenBSD: machdep.c,v 1.285 2004/03/10 23:02:53 tom Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2411,7 +2411,12 @@ boot(howto) int howto; { if (cold) { - howto |= RB_HALT; + /* + * If the system is cold, just halt, unless the user + * explicitly asked for reboot. + */ + if ((howto & RB_USERREQ) == 0) + howto |= RB_HALT; goto haltsys; } |