X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.c;h=f62ccdd1aa9be4271d1372660a3dd1a5590b8f43;hp=5b3009a465f7d43ac8f351c00aac7b1075fbd24b;hb=b6e83bb17299987bdd64a46669c62ea524dd133b;hpb=4d411d31deff5c4b2ad7d1689a9219c649843875 diff --git a/discover/grub2/grub2.c b/discover/grub2/grub2.c index 5b3009a..f62ccdd 100644 --- a/discover/grub2/grub2.c +++ b/discover/grub2/grub2.c @@ -1,6 +1,7 @@ #include #include +#include #include #include @@ -20,6 +21,7 @@ static const char *const grub2_conf_files[] = { "/boot/grub/grub.cfg", "/boot/grub2/grub.cfg", "/boot/grub/menu.lst", + "/efi/boot/grub.cfg", "/GRUB.CFG", "/MENU.LST", "/GRUB/GRUB.CFG", @@ -27,6 +29,7 @@ static const char *const grub2_conf_files[] = { "/GRUB/MENU.LST", "/BOOT/GRUB/GRUB.CFG", "/BOOT/GRUB/MENU.LST", + "/EFI/BOOT/GRUB.CFG", NULL }; @@ -103,6 +106,9 @@ static int grub2_parse(struct discover_context *dc) parser = grub2_parser_create(dc); grub2_parser_parse(parser, *filename, buf, len); + device_handler_status_dev_info(dc->handler, dc->device, + _("Parsed GRUB configuration from %s"), + *filename); talloc_free(buf); talloc_free(parser); break;