aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAdy <ady-sf@hotmail.com>2015-09-20 15:35:52 -0400
committerGene Cumm <gene.cumm@gmail.com>2015-09-20 15:35:54 -0400
commit7d9c9eca562857fed25b4c8ef902e3de968d7631 (patch)
treede6652b184070761c4a0798098fd34fb8cc56b68 /core
parente0ac1d2fdf7d7c58457f3796a12561cce95ca29f (diff)
downloadsyslinux-7d9c9eca562857fed25b4c8ef902e3de968d7631.tar.gz
syslinux-7d9c9eca562857fed25b4c8ef902e3de968d7631.tar.xz
syslinux-7d9c9eca562857fed25b4c8ef902e3de968d7631.zip
core/fs/lib/loadconfig.c: Add architecture-specific config name to search
When multiple architectures are on a single media, all will try to use the same config, preventing PATH from pointing to an architecture-specific directory. Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
Diffstat (limited to 'core')
-rw-r--r--core/fs/lib/loadconfig.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/fs/lib/loadconfig.c b/core/fs/lib/loadconfig.c
index 95e6f3f8..d164ae13 100644
--- a/core/fs/lib/loadconfig.c
+++ b/core/fs/lib/loadconfig.c
@@ -22,6 +22,11 @@ int generic_open_config(struct com32_filedata *filedata)
};
static const char *filenames[] = {
"extlinux.conf",
+#if defined(__FIRMWARE_EFI64__)
+ "syslx64.cfg",
+#elif defined(__FIRMWARE_EFI32__)
+ "syslia32.cfg",
+#endif
"syslinux.cfg",
NULL
};