X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=7a84302b71314104b74309c3167abe5314d017b2;hp=11fb115293fcd44076ac30cee7e695a4d7dc7e49;hb=e52b37c27c267c882d82cd1e34412817b5a4dbce;hpb=bad9baa8794ed0c31b7f93b110815d98db7b2d7a

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 11fb115..7a84302 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -86,11 +86,6 @@ struct discover_boot_option *discover_boot_option_create(
 	return opt;
 }
 
-static int device_match_path(struct discover_device *dev, const char *path)
-{
-	return dev->device_path && !strcmp(dev->device_path, path);
-}
-
 static int device_match_uuid(struct discover_device *dev, const char *uuid)
 {
 	return dev->uuid && !strcmp(dev->uuid, uuid);
@@ -130,26 +125,10 @@ static struct discover_device *device_lookup(
 struct discover_device *device_lookup_by_name(struct device_handler *handler,
 		const char *name)
 {
-	struct discover_device *dev;
-	char *path;
-
-	if (strncmp(name, "/dev/", strlen("/dev/")))
-		path = talloc_asprintf(NULL, "/dev/%s", name);
-	else
-		path = talloc_strdup(NULL, name);
-
-	dev = device_lookup_by_path(handler, path);
+	if (!strncmp(name, "/dev/", strlen("/dev/")))
+		name += strlen("/dev/");
 
-	talloc_free(path);
-
-	return dev;
-}
-
-struct discover_device *device_lookup_by_path(
-		struct device_handler *device_handler,
-		const char *path)
-{
-	return device_lookup(device_handler, device_match_path, path);
+	return device_lookup_by_id(handler, name);
 }
 
 struct discover_device *device_lookup_by_uuid(
@@ -331,7 +310,7 @@ static struct discover_device *discover_device_create(
 		struct event *event)
 {
 	struct discover_device *dev;
-	const char *devname;
+	const char *devnode;
 
 	dev = find_device(handler, event->device);
 	if (dev)
@@ -341,9 +320,9 @@ static struct discover_device *discover_device_create(
 	dev->device = talloc_zero(dev, struct device);
 	list_init(&dev->boot_options);
 
-	devname = event_get_param(ctx->event, "DEVNAME");
-	if (devname)
-		dev->device_path = talloc_strdup(dev, devname);
+	devnode = event_get_param(ctx->event, "node");
+	if (devnode)
+		dev->device_path = talloc_strdup(dev, devnode);
 
 	dev->device->id = talloc_strdup(dev, event->device);
 	dev->device->type = event_device_type(dev->device, event);