summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand/biosboot
diff options
context:
space:
mode:
authorTom Cosgrove <tom@cvs.openbsd.org>2004-02-10 00:35:17 +0000
committerTom Cosgrove <tom@cvs.openbsd.org>2004-02-10 00:35:17 +0000
commit5c2ea4962fa4b47869a41cdc4429f1ec708b6568 (patch)
tree40e88e98bc68f2beb5241c3f3c08ad964684df65 /sys/arch/i386/stand/biosboot
parent3d7f02192b0ced7342fe3fe7e721cceabb3b882d (diff)
Enable interrupts before halt when we error out. Allows use of
Ctl-Alt-Del to reboot in case of failure. Much testing nick@; thanks. ok weingart@, deraadt@.
Diffstat (limited to 'sys/arch/i386/stand/biosboot')
-rw-r--r--sys/arch/i386/stand/biosboot/biosboot.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/stand/biosboot/biosboot.S b/sys/arch/i386/stand/biosboot/biosboot.S
index 5d877056d24..49e64ee5baf 100644
--- a/sys/arch/i386/stand/biosboot/biosboot.S
+++ b/sys/arch/i386/stand/biosboot/biosboot.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosboot.S,v 1.36 2004/01/26 23:21:49 tom Exp $ */
+/* $OpenBSD: biosboot.S,v 1.37 2004/02/10 00:35:16 tom Exp $ */
/*
* Copyright (c) 2003 Tobias Weingartner
@@ -572,8 +572,8 @@ err_print2:
err_stop:
call Lmessage
stay_stopped:
- cli
- hlt
+ sti /* Ensure Ctl-Alt-Del will work */
+ hlt /* (don't require power cycle) */
jmp stay_stopped /* Just to make sure :-) */
exec_boot: