diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-02 16:13:44 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-02 16:13:44 -0700 |
| commit | 92371f2735d9dd82adfa6c16ef65a27f9263da7c (patch) | |
| tree | 609cbcf4f5c6f21a4c09b20ad7a44f9596d8a3c3 /core/include/fs.h | |
| parent | f88518c9b3538b229bc4e877fcc64a5e1515da8b (diff) | |
| download | syslinux-92371f2735d9dd82adfa6c16ef65a27f9263da7c.tar.gz | |
core: merge the configfile-searching code, isolinux generic names
Merge the config file searching code between syslinux and isolinux,
and make isolinux also recognize the generic names "syslinux" and
"syslinux.cfg". Thus, isolinux now searches for configuration files
in the following order:
/boot/isolinux/isolinux.cfg
/boot/isolinux/syslinux.cfg
/isolinux/isolinux.cfg
/isolinux/syslinux.cfg
/boot/syslinux/isolinux.cfg
/boot/syslinux/syslinux.cfg
/syslinux/isolinux.cfg
/syslinux/syslinux.cfg
/isolinux.cfg
/syslinux.cfg
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'core/include/fs.h')
| -rw-r--r-- | core/include/fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/include/fs.h b/core/include/fs.h index a01f9984..da247a98 100644 --- a/core/include/fs.h +++ b/core/include/fs.h @@ -213,6 +213,7 @@ char *getcwd(char *buf, size_t size); void generic_mangle_name(char *, const char *); /* loadconfig.c */ +int search_config(const char *search_directores[], const char *filenames[]); int generic_load_config(void); /* close.c */ |