X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2-parser.c;h=df1b755715d776acf93b37e8095afcdddcdeba22;hp=689c200d0f3f7ffc76ed113c0f996879ab9894d9;hb=dbf139003bd6c8c6ca03ae7f533aa74afd8060c6;hpb=b49b9c92416ce4b65642dd3395becb4ea083dc2b diff --git a/discover/grub2-parser.c b/discover/grub2-parser.c index 689c200..df1b755 100644 --- a/discover/grub2-parser.c +++ b/discover/grub2-parser.c @@ -27,7 +27,7 @@ #include "log/log.h" #include "talloc/talloc.h" -#include "pb-protocol/pb-protocol.h" +#include "types/types.h" #include "parser-conf.h" #include "parser-utils.h" #include "paths.h" @@ -134,10 +134,14 @@ static void grub2_process_pair(struct conf_context *conf, const char *name, static const char *const grub2_conf_files[] = { "/grub.cfg", "/menu.lst", + "/grub/grub.cfg", + "/grub/menu.lst", "/boot/grub/grub.cfg", "/boot/grub/menu.lst", "/GRUB.CFG", "/MENU.LST", + "/GRUB/GRUB.CFG", + "/GRUB/MENU.LST", "/BOOT/GRUB/GRUB.CFG", "/BOOT/GRUB/MENU.LST", NULL