protocol: Separate device add from boot-option add messages

[petitboot] / discover / grub2-parser.c

diff --git a/discover/grub2-parser.c b/discover/grub2-parser.c
index 689c200d0f3f7ffc76ed113c0f996879ab9894d9..df1b755715d776acf93b37e8095afcdddcdeba22 100644 (file)
--- 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