summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-05-31 12:01:15 -0700
committerH. Peter Anvin <hpa@zytor.com>2007-05-31 12:01:15 -0700
commit68077fd1242995566d948ef762e136bdae4aad86 (patch)
tree7b41a5838cdc2a7caff75c2b2e11ba995c0797b1
parentb97e75cc9b5bfec13a08f974a5143e7cfe9e928b (diff)
downloadsyslinux-68077fd1242995566d948ef762e136bdae4aad86.tar.gz
pxelinux: Save/set up/restore ES around init.inc
At this point, ES points to the PXE entry structure, but init.inc assumes ES == DS.
-rw-r--r--pxelinux.asm5
1 files changed, 4 insertions, 1 deletions
diff --git a/pxelinux.asm b/pxelinux.asm
index 8056796b..a5402c73 100644
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -308,8 +308,11 @@ _start1:
;
; Initialize screen (if we're using one)
;
+ push es ; Save ES -> PXE entry structure
+ push ds
+ pop es ; ES <- DS
%include "init.inc"
-
+ pop es ; Restore ES -> PXE entry structure
;
; Tell the user we got this far
;