[syslinux] syslinux efi configuration file name proposal

[Gene Cumm]

On Wed, Aug 27, 2014 at 2:08 AM, Prof. Dipl.-Ing. Klaus Knopper
<syslinux at knopper.net> wrote:

> Apparently, the rename of ldlinux.e32 to ldlinux.e64 for the 64bit
> variant is already in the mainline git, so the only change left for
> automatically chosing a different config file is the tiny patch attached
> here, which will
>
> - prepend syslnx64.cfg to the config file search path for the 64bit variant
> - prepend syslnx32.cfg to the config file search path for the 32bit variant
> - add /boot/isolinux and /isolinux plus isolinux.cfg to the search path for
>   all variants, just for the case that the "rename" was forgotten when copying
>   over the files from an iso9660 CD/DVD to FAT32 flash disk.
>
> Regards
> -Klaus

A simpler patch for just the config filenames (whitespace changed for email):

diff --git a/core/fs/lib/loadconfig.c b/core/fs/lib/loadconfig.c
index 95e6f3f..47101f9 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__)
+       "syslnx64.cfg",
+#elif defined(__FIRMWARE_EFI32__)
+       "syslnx32.cfg",
+#endif
        "syslinux.cfg",
        NULL
     };


-- 
-Gene