core: merge the configfile-searching code, isolinux generic names
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 2 Jul 2010 23:13:44 +0000 (16:13 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 2 Jul 2010 23:13:44 +0000 (16:13 -0700)
commit92371f2735d9dd82adfa6c16ef65a27f9263da7c
tree609cbcf4f5c6f21a4c09b20ad7a44f9596d8a3c3
parentf88518c9b3538b229bc4e877fcc64a5e1515da8b
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>
core/fs/iso9660/iso9660.c
core/fs/lib/loadconfig.c
core/include/fs.h