X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=devices%2Fudev-helper.c;h=6a9a42bac12e9c626e1c768dd7664edf759ac74c;hp=da12129316142814462162674d4e7aabdd69513f;hb=6ce15c4265d3813ee311756ec03c6e4da74c1dbd;hpb=f6de8493cf6645f8da027671f935cf22f8008a1b

diff --git a/devices/udev-helper.c b/devices/udev-helper.c
index da12129..6a9a42b 100644
--- a/devices/udev-helper.c
+++ b/devices/udev-helper.c
@@ -26,6 +26,7 @@
 
 extern struct parser native_parser;
 extern struct parser yaboot_parser;
+extern struct parser kboot_parser;
 static FILE *logf;
 static int sock;
 
@@ -33,6 +34,7 @@ static int sock;
 static struct parser *parsers[] = {
 	&native_parser,
 	&yaboot_parser,
+	&kboot_parser,
 	NULL
 };
 
@@ -48,7 +50,7 @@ static void iterate_parsers(const char *devpath, const char *mountpoint)
 		log("\ttrying parser '%s'\n", parsers[i]->name);
 		/* just use a dummy device path for now */
 		if (parsers[i]->parse(devpath, mountpoint))
-			return;
+			/*return*/;
 	}
 	log("\tno boot_options found\n");
 }
@@ -370,6 +372,8 @@ enum generic_icon_type guess_device_type(void)
 	const char *bus = getenv("ID_BUS");
 	if (type && streq(type, "cd"))
 		return ICON_TYPE_OPTICAL;
+	if (!bus)
+		return ICON_TYPE_UNKNOWN;
 	if (streq(bus, "usb"))
 		return ICON_TYPE_USB;
 	if (streq(bus, "ata") || streq(bus, "scsi"))