From 816932ec84dbea9dc1f212a6ac749d077689febc Mon Sep 17 00:00:00 2001
From: hpa <hpa>
Date: Thu, 24 Oct 2002 17:31:45 +0000
Subject: (Hopefully) fix bug related to very long configuration files

ISOLINUX: support /boot/isolinux as well as /isolinux
---
 isolinux.asm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'isolinux.asm')

diff --git a/isolinux.asm b/isolinux.asm
index 9e41add4..71f1c58d 100644
--- a/isolinux.asm
+++ b/isolinux.asm
@@ -796,13 +796,18 @@ get_fs_structures:
 		mov [RootDir+dir_clust],eax
 		mov [CurDir+dir_clust],eax
 
-		; Look for an "isolinux" directory, and if found,
+		; Look for an isolinux directory, and if found,
 		; make it the current directory instead of the root
 		; directory.
+		mov di,boot_dir			; Search for /boot/isolinux
+		mov al,02h
+		call searchdir_iso
+		jnz .found_dir
 		mov di,isolinux_dir
-		mov al,02h			; Search for a directory
+		mov al,02h			; Search for /isolinux
 		call searchdir_iso
 		jz .no_isolinux_dir
+.found_dir:
 		mov [CurDir+dir_len],eax
 		mov eax,[si+file_left]
 		mov [CurDir+dir_clust],eax
@@ -1525,6 +1530,7 @@ aborted_msg	db ' aborted.', CR, LF, 0
 crff_msg	db CR, FF, 0
 default_str	db 'default', 0
 default_len	equ ($-default_str)
+boot_dir	db '/boot'			; /boot/isolinux
 isolinux_dir	db '/isolinux', 0
 isolinux_cfg	db 'isolinux.cfg', 0
 err_disk_image	db 'Cannot load disk image (invalid file)?', CR, LF, 0
-- 
cgit v1.2.1