X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fparser.c;h=5f4e5149557678c6e0c34c59c02a42f5b5b46317;hb=6276a57e76cf22aac639236d4782b56e2e5b9d5e;hp=c106dec0ae20c0a6210d317060cbe125f9656450;hpb=7c5e552c210b38a06ed9fbb99418b62e20978666;p=petitboot

diff --git a/discover/parser.c b/discover/parser.c
index c106dec..5f4e514 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,22 +1,23 @@
 
 #include <stdlib.h>
 
-#include "pb-protocol/pb-protocol.h"
+#include "types/types.h"
 #include <log/log.h>
 
 #include "device-handler.h"
 #include "parser.h"
 #include "parser-utils.h"
 
+struct parser __grub2_parser;
+struct parser __kboot_parser;
 struct parser __native_parser;
 struct parser __yaboot_parser;
-struct parser __kboot_parser;
-struct parser __grub2_parser;
 
 static const struct parser *const parsers[] = {
 //	&__native_parser,
-	&__yaboot_parser,
 	&__kboot_parser,
+	&__grub2_parser,
+	&__yaboot_parser,
 	NULL
 };
 
@@ -25,7 +26,7 @@ void iterate_parsers(struct discover_context *ctx)
 	int i;
 	unsigned int count = 0;
 
-	pb_log("trying parsers for %s\n", ctx->device_path);
+	pb_log("trying parsers for %s\n", ctx->device->device->id);
 
 	for (i = 0; parsers[i]; i++) {
 		pb_log("\ttrying parser '%s'\n", parsers[i]->name);