[syslinux:elflink] elflink: Look for syslinux.cfg

syslinux-bot for Matt Fleming matt.fleming at linux.intel.com
Mon Mar 14 15:33:51 PDT 2011


Commit-ID:  f8c8e0e0f1556280a983e281f7ef0ed3af2d36b9
Gitweb:     http://syslinux.zytor.com/commit/f8c8e0e0f1556280a983e281f7ef0ed3af2d36b9
Author:     Matt Fleming <matt.fleming at linux.intel.com>
AuthorDate: Thu, 3 Mar 2011 11:15:47 +0000
Committer:  Matt Fleming <matt.fleming at linux.intel.com>
CommitDate: Wed, 9 Mar 2011 14:32:36 +0000

elflink: Look for syslinux.cfg

Add syslinux.cfg to the list of configuration file names to check for
when the config parser searches for configuration files.

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


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

diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 9857233..18c1183 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -1049,6 +1049,10 @@ static int parse_one_config(const char *filename)
 	if (f)
 		goto config_found;
 
+	f = fopen("syslinux.cfg", "r");
+	if (f)
+		goto config_found;
+
 	return -1;
 config_found:
 	parse_config_file(f);



More information about the Syslinux-commits mailing list