[syslinux:elflink] ldlinux: Search in isolinux/ directory for config files

syslinux-bot for Matt Fleming matt.fleming at linux.intel.com
Fri May 27 17:15:18 PDT 2011


Commit-ID:  e4ab28da5f6434c046926532f7e06c3ee2bb09e4
Gitweb:     http://syslinux.zytor.com/commit/e4ab28da5f6434c046926532f7e06c3ee2bb09e4
Author:     Matt Fleming <matt.fleming at linux.intel.com>
AuthorDate: Tue, 24 May 2011 11:37:49 +0100
Committer:  Matt Fleming <matt.fleming at linux.intel.com>
CommitDate: Tue, 24 May 2011 11:37:49 +0100

ldlinux: Search in isolinux/ directory for config files

If we're running from an ISO image we should be looking in the
isolinux/ directory for isolinux.cfg, not in the top-level directory.

Signed-off-by: Matt Fleming <matt.fleming at linux.intel.com>


---
 com32/elflink/ldlinux/readconfig.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 441651e..8ded92a 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -1154,7 +1154,7 @@ static int parse_one_config(const char *filename)
 	if (f)
 		goto config_found;
 
-	f = fopen("isolinux.cfg", "r");
+	f = fopen("isolinux/isolinux.cfg", "r");
 	if (f)
 		goto config_found;
 



More information about the Syslinux-commits mailing list