If we have multipath devices present in the system, we'll end up with
duplicate mounts, parse results and boot options. This change adds a
check to see if we've encountered a device with this serial number
previously.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
return !strcmp(dev->device->id, id);
}
return !strcmp(dev->device->id, id);
}
+static int device_match_serial(struct discover_device *dev, const char *serial)
+{
+ const char *val = discover_device_get_param(dev, "ID_SERIAL");
+ return val && !strcmp(val, serial);
+}
+
static struct discover_device *device_lookup(
struct device_handler *device_handler,
int (match_fn)(struct discover_device *, const char *),
static struct discover_device *device_lookup(
struct device_handler *device_handler,
int (match_fn)(struct discover_device *, const char *),
return device_lookup(device_handler, device_match_id, id);
}
return device_lookup(device_handler, device_match_id, id);
}
+struct discover_device *device_lookup_by_serial(
+ struct device_handler *device_handler,
+ const char *serial)
+{
+ return device_lookup(device_handler, device_match_serial, serial);
+}
+
void device_handler_destroy(struct device_handler *handler)
{
talloc_free(handler);
void device_handler_destroy(struct device_handler *handler)
{
talloc_free(handler);
const char *label);
struct discover_device *device_lookup_by_id(struct device_handler *handler,
const char *id);
const char *label);
struct discover_device *device_lookup_by_id(struct device_handler *handler,
const char *id);
+struct discover_device *device_lookup_by_serial(
+ struct device_handler *device_handler,
+ const char *serial);
void discover_device_set_param(struct discover_device *device,
const char *name, const char *value);
void discover_device_set_param(struct discover_device *device,
const char *name, const char *value);
{
struct discover_device *ddev;
const char *typestr;
{
struct discover_device *ddev;
const char *typestr;
const char *path;
const char *name;
const char *path;
const char *name;
+ /* we may also see multipath devices; same dev nodes (hence id), but
+ * different serial numbers */
+ serial = udev_device_get_property_value(dev, "ID_SERIAL");
+ if (serial && device_lookup_by_serial(udev->handler, serial))
+ return -1;
+
ddev = discover_device_create(udev->handler, name);
ddev->device_path = udev_device_get_devnode(dev);
ddev = discover_device_create(udev->handler, name);
ddev->device_path = udev_device_get_devnode(dev);