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/ddb/db_command.c | |
| 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/ddb/db_command.c')
| -rw-r--r-- | sys/ddb/db_command.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 3674e9088e9..819985b2553 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_command.c,v 1.32 2003/12/03 12:50:33 markus Exp $ */ +/* $OpenBSD: db_command.c,v 1.33 2004/03/10 23:02:53 tom Exp $ */ /* $NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $ */ /* @@ -611,7 +611,7 @@ db_boot_sync_cmd(addr, haddr, count, modif) db_expr_t count; char *modif; { - boot(RB_AUTOBOOT | RB_TIMEBAD); + boot(RB_AUTOBOOT | RB_TIMEBAD | RB_USERREQ); } void @@ -621,7 +621,7 @@ db_boot_crash_cmd(addr, haddr, count, modif) db_expr_t count; char *modif; { - boot(RB_NOSYNC | RB_DUMP | RB_TIMEBAD); + boot(RB_NOSYNC | RB_DUMP | RB_TIMEBAD | RB_USERREQ); } void @@ -631,7 +631,7 @@ db_boot_dump_cmd(addr, haddr, count, modif) db_expr_t count; char *modif; { - boot(RB_DUMP | RB_TIMEBAD); + boot(RB_DUMP | RB_TIMEBAD | RB_USERREQ); } void @@ -641,7 +641,7 @@ db_boot_halt_cmd(addr, haddr, count, modif) db_expr_t count; char *modif; { - boot(RB_NOSYNC | RB_HALT | RB_TIMEBAD); + boot(RB_NOSYNC | RB_HALT | RB_TIMEBAD | RB_USERREQ); } void @@ -651,7 +651,7 @@ db_boot_reboot_cmd(addr, haddr, count, modif) db_expr_t count; char *modif; { - boot(RB_AUTOBOOT | RB_NOSYNC | RB_TIMEBAD); + boot(RB_AUTOBOOT | RB_NOSYNC | RB_TIMEBAD | RB_USERREQ); } void @@ -661,7 +661,7 @@ db_boot_poweroff_cmd(addr, haddr, count, modif) db_expr_t count; char *modif; { - boot(RB_NOSYNC | RB_HALT | RB_POWERDOWN | RB_TIMEBAD); + boot(RB_NOSYNC | RB_HALT | RB_POWERDOWN | RB_TIMEBAD | RB_USERREQ); } void |