diff options
author | H. Peter Anvin <hpa@zytor.com> | 2006-08-21 17:10:28 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2006-08-21 17:10:28 -0700 |
commit | abd0e0be791f9c2b19481001c069e41b8bb46020 (patch) | |
tree | 7daed4482cb6c9f40881bf055e075e9e34d879ef | |
parent | f8c092bd1435421518dd8a7922b5d89e5ed8576e (diff) | |
parent | 481db1b5e161ae9af4aed1103de20a61ccb82335 (diff) | |
download | syslinux-3.20-pre17.tar.gz |
Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.gitsyslinux-3.20-pre17
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | isolinux.asm | 4 | ||||
-rw-r--r-- | ui.inc | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -17,6 +17,7 @@ Changes in 3.20: info. * Fix issue where going back and forth between menus a lot would cause a hang. + * ISOLINUX: Fix bug which made "cd boot sectors" not work. Changes in 3.11: * MEMDISK: Fix bug by which accessing the real floppy disk diff --git a/isolinux.asm b/isolinux.asm index 4d2a4728..acf7806c 100644 --- a/isolinux.asm +++ b/isolinux.asm @@ -212,7 +212,9 @@ xbs_vgatmpbuf equ 2*trackbufsize ;; CD-ROM sector (2K) of the file, so the number one priority is actually ;; loading the rest. ;; -StackBuf equ $ +StackBuf equ $-44 ; 44 bytes needed for + ; the bootsector chainloading + ; code! bootsec equ $ @@ -506,7 +506,7 @@ kernel_good: ; At this point, DX:AX contains the size of the kernel, and SI contains ; the file handle/cluster pointer. ; - or ecx,20202000h ; Force lower case + or ecx,20202000h ; Force lower case (except dot) cmp ecx,'.com' je is_comboot_image |