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);
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(
return NULL;
}
+static enum device_type event_device_type(struct device *device,
+ struct event *event)
+{
+ const char *param;
+
+ param = event_get_param(event, "type");
+ if (!param) {
+ pb_log("%s: empty type\n", device->id);
+ return DEVICE_TYPE_UNKNOWN;
+ }
+
+ if (!strcmp(param, "disk") || !strcmp(param, "partition"))
+ return DEVICE_TYPE_DISK;
+
+ if (!strcmp(param, "net"))
+ return DEVICE_TYPE_NETWORK;
+
+ pb_log("%s: unknown type '%s'\n", device->id, param);
+ return DEVICE_TYPE_UNKNOWN;
+}
+
static struct discover_device *discover_device_create(
struct device_handler *handler,
struct discover_context *ctx,
struct event *event)
{
struct discover_device *dev;
- const char *devname;
+ const char *devnode;
dev = find_device(handler, event->device);
if (dev)
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);
talloc_set_destructor(dev, destroy_device);