ui/ncurses: Allow booting custom boot options

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index 1c5cf71ff4fee7caf0949211ba4c0f7ee48afd37..6212e4309137f47feb97cd0b09043193fdc13191 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -70,8 +70,10 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
 {
        struct discover_device *ddev;
        const char *typestr;
+       const char *serial;
        const char *path;
        const char *name;
+       const char *prop;
 
        name = udev_device_get_sysname(dev);
        if (!name) {
@@ -104,11 +106,21 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
                return -1;
        }
 
+       /* 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->uuid = udev_device_get_property_value(dev, "ID_FS_UUID");
-       ddev->label = udev_device_get_property_value(dev, "ID_FS_LABEL");
+       prop = udev_device_get_property_value(dev, "ID_FS_UUID");
+       if (prop)
+               ddev->uuid = talloc_strdup(ddev, prop);
+       prop = udev_device_get_property_value(dev, "ID_FS_LABEL");
+       if (prop)
+               ddev->label = talloc_strdup(ddev, prop);
        ddev->device->type = DEVICE_TYPE_DISK;
 
        udev_setup_device_params(dev, ddev);