[syslinux] [syslinux:master] core/fs/lib/loadconfig.c: Add architecture-specific config name to search

[Gene Cumm]

On Sun, Sep 20, 2015 at 3:57 PM, syslinux-bot for Ady
<ady-sf at hotmail.com> wrote:
> Commit-ID:  7d9c9eca562857fed25b4c8ef902e3de968d7631
> Gitweb:     http://www.syslinux.org/commit/7d9c9eca562857fed25b4c8ef902e3de968d7631
> Author:     Ady <ady-sf at hotmail.com>
> AuthorDate: Sun, 20 Sep 2015 15:35:52 -0400
> Committer:  Gene Cumm <gene.cumm at gmail.com>
> CommitDate: Sun, 20 Sep 2015 15:35:54 -0400
>
> 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 at gmail.com>
>
> ---
>  core/fs/lib/loadconfig.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/core/fs/lib/loadconfig.c b/core/fs/lib/loadconfig.c
> index 95e6f3f..d164ae1 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
>      };

>From the thread "[syslinux] syslinux efi configuration file name
proposal" at http://www.syslinux.org/archives/2014-October/022712.html

-- 
-Gene