packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grub2: Handle aarch64 (at least on Fedora/RHEL) 

See: https://github.com/projectatomic/rpm-ostree-toolbox/issues/102#issuecomment-316483554

The logic here should now match what grubby does.  I have no
idea whether this applies to other distributions though.

Closes: #1021
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-07-19 15:59:46 -04:00 committed by Atomic Bot
parent 79a88ac249
commit d24b259cc5
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/libostree/ostree-bootloader-grub2.c
View File

@ -38,9 +38,19 @@
* among others. * among others.
*/ */
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
#define GRUB2_USES_16 1 #define GRUB2_SUFFIX "16"
#else #else
#define GRUB2_USES_16 0 #define GRUB2_SUFFIX ""
#endif
/* https://github.com/projectatomic/rpm-ostree-toolbox/issues/102#issuecomment-316483554
* https://github.com/rhboot/grubby/blob/34b1436ccbd56eab8024314cab48f2fc880eef08/grubby.c#L63
*
* This is true at least on Fedora/Red Hat Enterprise Linux for aarch64.
*/
#if defined(__aarch64__)
#define GRUB2_EFI_SUFFIX ""
#else
#define GRUB2_EFI_SUFFIX "efi"
#endif #endif
struct _OstreeBootloaderGrub2 struct _OstreeBootloaderGrub2
@ -214,16 +224,12 @@ _ostree_bootloader_grub2_generate_config (OstreeSysroot *sysroot
"No \"linux\" key in bootloader config"); "No \"linux\" key in bootloader config");
goto out; goto out;
} }
g_string_append (output, "linux");
if (is_efi) if (is_efi)
g_string_append (output, "linuxefi "); g_string_append (output, GRUB2_EFI_SUFFIX);
else else
{ g_string_append (output, GRUB2_SUFFIX);
#if GRUB2_USES_16 g_string_append_c (output, ' ');
g_string_append (output, "linux16 ");
#else
g_string_append (output, "linux ");
#endif
}
g_string_append (output, kernel); g_string_append (output, kernel);
options = ostree_bootconfig_parser_get (config, "options"); options = ostree_bootconfig_parser_get (config, "options");
@ -237,16 +243,12 @@ _ostree_bootloader_grub2_generate_config (OstreeSysroot *sysroot
initrd = ostree_bootconfig_parser_get (config, "initrd"); initrd = ostree_bootconfig_parser_get (config, "initrd");
if (initrd) if (initrd)
{ {
g_string_append (output, "initrd");
if (is_efi) if (is_efi)
g_string_append (output, "initrdefi "); g_string_append (output, GRUB2_EFI_SUFFIX);
else else
{ g_string_append (output, GRUB2_SUFFIX);
#if GRUB2_USES_16 g_string_append_c (output, ' ');
g_string_append (output, "initrd16 ");
#else
g_string_append (output, "initrd ");
#endif
}
g_string_append (output, initrd); g_string_append (output, initrd);
g_string_append_c (output, '\n'); g_string_append_c (output, '\n');
} }