vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-install-common.c (platforms): Fix the order of entries and

Browse source 
remove useless field val.
This commit is contained in:
Vladimir Serbinenko 2013-11-17 00:54:40 +01:00
parent 55e2c84fe3
commit d4d55b29e0
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-11-17 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install-common.c (platforms): Fix the order of entries and
remove useless field val.
2013-11-16 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-16 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.c: Add new option --no-bootsector to skip * util/grub-install.c: Add new option --no-bootsector to skip

39
util/grub-install-common.c
View file

@ -585,28 +585,27 @@ copy_locales (const char *dstd)
static struct static struct
{ {
enum grub_install_plat val;
const char *cpu; const char *cpu;
const char *platform; const char *platform;
} platforms[] = } platforms[GRUB_INSTALL_PLATFORM_MAX] =
{ {
{ GRUB_INSTALL_PLATFORM_I386_PC, "i386", "pc" }, [GRUB_INSTALL_PLATFORM_I386_PC] = { "i386", "pc" },
{ GRUB_INSTALL_PLATFORM_I386_EFI, "i386", "efi" }, [GRUB_INSTALL_PLATFORM_I386_EFI] = { "i386", "efi" },
{ GRUB_INSTALL_PLATFORM_I386_QEMU, "i386", "qemu" }, [GRUB_INSTALL_PLATFORM_I386_QEMU] = { "i386", "qemu" },
{ GRUB_INSTALL_PLATFORM_I386_COREBOOT, "i386", "coreboot" }, [GRUB_INSTALL_PLATFORM_I386_COREBOOT] = { "i386", "coreboot" },
{ GRUB_INSTALL_PLATFORM_I386_MULTIBOOT, "i386", "multiboot" }, [GRUB_INSTALL_PLATFORM_I386_MULTIBOOT] = { "i386", "multiboot" },
{ GRUB_INSTALL_PLATFORM_I386_IEEE1275, "i386", "ieee1275" }, [GRUB_INSTALL_PLATFORM_I386_IEEE1275] = { "i386", "ieee1275" },
{ GRUB_INSTALL_PLATFORM_X86_64_EFI, "x86_64", "efi" }, [GRUB_INSTALL_PLATFORM_X86_64_EFI] = { "x86_64", "efi" },
{ GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON, "mipsel", "loongson" }, [GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON] = { "mipsel", "loongson" },
{ GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS, "mipsel", "qemu_mips" }, [GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS] = { "mipsel", "qemu_mips" },
{ GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS, "mips", "qemu_mips" }, [GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS] = { "mips", "qemu_mips" },
{ GRUB_INSTALL_PLATFORM_MIPSEL_ARC, "mipsel", "arc" }, [GRUB_INSTALL_PLATFORM_MIPSEL_ARC] = { "mipsel", "arc" },
{ GRUB_INSTALL_PLATFORM_MIPS_ARC, "mips", "arc" }, [GRUB_INSTALL_PLATFORM_MIPS_ARC] = { "mips", "arc" },
{ GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275, "sparc64", "ieee1275" }, [GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275] = { "sparc64", "ieee1275" },
{ GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275, "powerpc", "ieee1275" }, [GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275] = { "powerpc", "ieee1275" },
{ GRUB_INSTALL_PLATFORM_IA64_EFI, "ia64", "efi" }, [GRUB_INSTALL_PLATFORM_IA64_EFI] = { "ia64", "efi" },
{ GRUB_INSTALL_PLATFORM_ARM_EFI, "arm", "efi" }, [GRUB_INSTALL_PLATFORM_ARM_EFI] = { "arm", "efi" },
{ GRUB_INSTALL_PLATFORM_ARM_UBOOT, "arm", "uboot" }, [GRUB_INSTALL_PLATFORM_ARM_UBOOT] = { "arm", "uboot" },
}; };
char * char *
@ -825,7 +824,7 @@ grub_install_get_target (const char *src)
&& strcmp (platforms[i].platform, pl) == 0) && strcmp (platforms[i].platform, pl) == 0)
{ {
free (fn); free (fn);
return platforms[i].val; return i;
} }
grub_util_error (_("Unknown platform `%s-%s'"), c, pl); grub_util_error (_("Unknown platform `%s-%s'"), c, pl);
} }