X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fkboot-parser.c;h=f0976746ee80241e679124ee443e3b4a1193b983;hp=cb6a2483bc3092756e2d488a9b3e0b6588114745;hb=9af0c65fa5ba9ae8527a70dbf0e808d777dfb479;hpb=e4f5bd235894c11823ac1befe8c8c43063cad026

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index cb6a248..f097674 100644
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -9,7 +9,7 @@
 #include "types/types.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
-#include "paths.h"
+#include "resource.h"
 
 static void kboot_process_pair(struct conf_context *conf, const char *name,
 		char *value)
@@ -83,8 +83,8 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
 	}
 
 out_add:
-	opt->boot_image_file = resolve_path(opt, value,
-			conf->dc->device->device_path);
+	d_opt->boot_image = create_devpath_resource(opt,
+				conf->dc->device, value);
 
 	if (root) {
 		opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args);
@@ -93,8 +93,8 @@ out_add:
 		opt->boot_args = args;
 
 	if (initrd) {
-		opt->initrd_file = resolve_path(opt, initrd,
-				conf->dc->device->device_path);
+		d_opt->initrd = create_devpath_resource(opt,
+				conf->dc->device, initrd);
 
 		opt->description = talloc_asprintf(opt, "%s initrd=%s %s",
 			value, initrd, opt->boot_args);
@@ -157,8 +157,12 @@ static int kboot_parse(struct discover_context *dc, char *buf, int len)
 	return 1;
 }
 
-struct parser __kboot_parser = {
-	.name		= "kboot",
-	.parse		= kboot_parse,
-	.filenames	= kboot_conf_files,
+static struct parser kboot_parser = {
+	.name			= "kboot",
+	.method			= CONF_METHOD_LOCAL_FILE,
+	.parse			= kboot_parse,
+	.filenames		= kboot_conf_files,
+	.resolve_resource	= resolve_devpath_resource,
 };
+
+register_parser(kboot_parser);