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/hppa | |
| 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/hppa')
| -rw-r--r-- | sys/arch/hppa/hppa/machdep.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c index f7a6d1bb5f4..a2b12d6226c 100644 --- a/sys/arch/hppa/hppa/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.124 2004/02/14 15:09:22 grange Exp $ */ +/* $OpenBSD: machdep.c,v 1.125 2004/03/10 23:02:53 tom Exp $ */ /* * Copyright (c) 1999-2002 Michael Shalayeff @@ -935,9 +935,11 @@ boot(howto) int howto; { /* If system is cold, just halt. */ - if (cold) - howto |= RB_HALT; - else { + if (cold) { + /* (Unless the user explicitly asked for reboot.) */ + if ((howto & RB_USERREQ) == 0) + howto |= RB_HALT; + } else { boothowto = howto | (boothowto & RB_HALT); |