Merge pull request #208 from endlessm/T34161-no-grub-hack

Revert "grub2: Disable use of grub-mkconfig on Endless"
endlessm · Dec 6, 2022 · 8a59c41 · 8a59c41
2 parents ff7799b + 6aa9cbc
commit 8a59c41
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
@@ -76,16 +76,6 @@ _ostree_bootloader_grub2_query (OstreeBootloader *bootloader,
 {
   OstreeBootloaderGrub2 *self = OSTREE_BOOTLOADER_GRUB2 (bootloader);
 
-  /* FIXME: Endless specific patch: don't let libostree find our
-   * /boot/grub/grub.cfg because we manage that separately and disable
-   * grub-mkconfig. See:
-   * - https://phabricator.endlessm.com/T19614
-   * - https://phabricator.endlessm.com/T18848 */
-  {
-    *out_is_active = FALSE;
-    return TRUE;
-  }
-
   /* Look for the BIOS path first */
   if (g_file_query_exists (self->config_path_bios_1, NULL) ||
       g_file_query_exists (self->config_path_bios_2, NULL))