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

lib/grub2: Support Debian-style grub.cfg path 

Debian and Debian-derived systems have their GRUB configuration file in
/boot/grub/grub.cfg, rather than /boot/grub2/grub.cfg. Detecting this
file is necessary to correctly generate GRUB boot configuration on
Debian systems.

Closes: #1714
Approved by: cgwalters
This commit is contained in:
Felix Krull 2018-08-29 20:23:03 +02:00 committed by Atomic Bot
parent 630b786402
commit 74bdf7e173
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,8 @@ struct _OstreeBootloaderGrub2
GObject parent_instance; GObject parent_instance;
OstreeSysroot *sysroot; OstreeSysroot *sysroot;
GFile *config_path_bios; GFile *config_path_bios_1;
GFile *config_path_bios_2;
GFile *config_path_efi; GFile *config_path_efi;
gboolean is_efi; gboolean is_efi;
}; };
@ -77,7 +78,8 @@ _ostree_bootloader_grub2_query (OstreeBootloader *bootloader,
OstreeBootloaderGrub2 *self = OSTREE_BOOTLOADER_GRUB2 (bootloader); OstreeBootloaderGrub2 *self = OSTREE_BOOTLOADER_GRUB2 (bootloader);
/* Look for the BIOS path first */ /* Look for the BIOS path first */
if (g_file_query_exists (self->config_path_bios, NULL)) if (g_file_query_exists (self->config_path_bios_1, NULL) ||
g_file_query_exists (self->config_path_bios_2, NULL))
{ {
/* If we found it, we're done */ /* If we found it, we're done */
*out_is_active = TRUE; *out_is_active = TRUE;
@ -97,7 +99,7 @@ _ostree_bootloader_grub2_query (OstreeBootloader *bootloader,
cancellable, error); cancellable, error);
if (!direnum) if (!direnum)
return FALSE; return FALSE;
while (TRUE) while (TRUE)
{ {
GFileInfo *file_info; GFileInfo *file_info;
@ -448,7 +450,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader *bootloader,
} }
static gboolean static gboolean
_ostree_bootloader_grub2_is_atomic (OstreeBootloader *bootloader) _ostree_bootloader_grub2_is_atomic (OstreeBootloader *bootloader)
{ {
OstreeBootloaderGrub2 *self = OSTREE_BOOTLOADER_GRUB2 (bootloader); OstreeBootloaderGrub2 *self = OSTREE_BOOTLOADER_GRUB2 (bootloader);
return !self->is_efi; return !self->is_efi;
@ -460,7 +462,8 @@ _ostree_bootloader_grub2_finalize (GObject *object)
OstreeBootloaderGrub2 *self = OSTREE_BOOTLOADER_GRUB2 (object); OstreeBootloaderGrub2 *self = OSTREE_BOOTLOADER_GRUB2 (object);
g_clear_object (&self->sysroot); g_clear_object (&self->sysroot);
g_clear_object (&self->config_path_bios); g_clear_object (&self->config_path_bios_1);
g_clear_object (&self->config_path_bios_2);
g_clear_object (&self->config_path_efi); g_clear_object (&self->config_path_efi);
G_OBJECT_CLASS (_ostree_bootloader_grub2_parent_class)->finalize (object); G_OBJECT_CLASS (_ostree_bootloader_grub2_parent_class)->finalize (object);
@ -493,6 +496,9 @@ _ostree_bootloader_grub2_new (OstreeSysroot *sysroot)
{ {
OstreeBootloaderGrub2 *self = g_object_new (OSTREE_TYPE_BOOTLOADER_GRUB2, NULL); OstreeBootloaderGrub2 *self = g_object_new (OSTREE_TYPE_BOOTLOADER_GRUB2, NULL);
self->sysroot = g_object_ref (sysroot); self->sysroot = g_object_ref (sysroot);
self->config_path_bios = g_file_resolve_relative_path (self->sysroot->path, "boot/grub2/grub.cfg"); /* Used by (at least) Debian */
self->config_path_bios_1 = g_file_resolve_relative_path (self->sysroot->path, "boot/grub/grub.cfg");
/* Used by (at least) Fedora */
self->config_path_bios_2 = g_file_resolve_relative_path (self->sysroot->path, "boot/grub2/grub.cfg");
return self; return self;
} }