aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2005-08-18 21:15:01 +0000
committerhpa <hpa>2005-08-18 21:15:01 +0000
commit94db804fb314c86adca32b899cd1b3e10fb5610b (patch)
treeb957da0c37464a2fd214038cd2e4eb2c5017f026
parent8d4a3ad6652e40fbe44cde878c8e0ad0c2c34a94 (diff)
downloadsyslinux-elf-syslinux-3.10-pre11.tar.gz
syslinux-elf-syslinux-3.10-pre11.tar.xz
syslinux-elf-syslinux-3.10-pre11.zip
NOESCAPE: run the default command if a load is interruptedsyslinux-3.10-pre11
-rw-r--r--abort.inc10
1 files changed, 4 insertions, 6 deletions
diff --git a/abort.inc b/abort.inc
index 3c905971..e2cfcbb9 100644
--- a/abort.inc
+++ b/abort.inc
@@ -61,12 +61,10 @@ abort_check:
sti
call cwritestr ; Expects SI -> error msg
- ; If onerror is set, jump to onerror, otherwise return
- ; to the command prompt
- mov cx,[OnerrorLen]
- and cx,cx
- jnz on_error
- jmp enter_command ; Return to command prompt
+ ; If NOESCAPE is active, then execute the default command
+ cmp byte [KbdFlags],0
+ jz auto_boot ; Default command
+ jmp enter_command ; Otherwise command prompt
;
; End of abort_check