Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.gitsyslinux-3.20-pre17

3 files changed, 5 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 14e53a4f..96a06381 100644
--- a/NEWS
+++ b/NEWS
@@ -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 $
 
diff --git a/ui.inc b/ui.inc
index b238ae43..6ea3a4a6 100644
--- a/ui.inc
+++ b/ui.inc
@@ -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