discover: fix return value for discover_device_get_param

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index 80029d6820d225f001940d696ec3c67c63ced878..e3495e99efe7f6f69ad33ba42dae26c07c2900d6 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -1,5 +1,7 @@
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -58,23 +60,17 @@ static void udev_setup_device_params(struct udev_device *udev,
                                udev_list_entry_get_value(entry));
 }
 
-static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
+static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
+               const char *name)
 {
        struct discover_device *ddev;
        const char *typestr;
-       const char *serial;
+       const char *uuid;
        const char *path;
-       const char *name;
        const char *node;
        const char *prop;
        bool cdrom;
 
-       name = udev_device_get_sysname(dev);
-       if (!name) {
-               pb_debug("udev_device_get_sysname failed\n");
-               return -1;
-       }
-
        typestr = udev_device_get_devtype(dev);
        if (!typestr) {
                pb_debug("udev_device_get_devtype failed\n");
@@ -105,30 +101,29 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
                }
        }
 
-       /* We have enough info to create the device and start discovery */
-       ddev = device_lookup_by_id(udev->handler, name);
-       if (ddev) {
-               pb_debug("device %s is already present?\n", name);
-               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;
+       /* We may see multipath devices; they'll have the same uuid as an
+        * existing device, so only parse the first. */
+       uuid = udev_device_get_property_value(dev, "ID_FS_UUID");
+       if (uuid) {
+               ddev = device_lookup_by_uuid(udev->handler, uuid);
+               if (ddev) {
+                       pb_log("SKIP: %s UUID [%s] already present (as %s)\n",
+                                       name, uuid, ddev->device->id);
+                       return -1;
+               }
+       }
 
        ddev = discover_device_create(udev->handler, name);
 
        ddev->device_path = talloc_strdup(ddev, node);
 
-       prop = udev_device_get_property_value(dev, "ID_FS_UUID");
-       if (prop)
-               ddev->uuid = talloc_strdup(ddev, prop);
+       if (uuid)
+               ddev->uuid = talloc_strdup(ddev, uuid);
        prop = udev_device_get_property_value(dev, "ID_FS_LABEL");
        if (prop)
                ddev->label = talloc_strdup(ddev, prop);
-       ddev->device->type = DEVICE_TYPE_DISK;
+       ddev->device->type = cdrom ? DEVICE_TYPE_OPTICAL : DEVICE_TYPE_DISK;
 
        udev_setup_device_params(dev, ddev);
 
@@ -137,6 +132,37 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
        return 0;
 }
 
+static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
+{
+       const char *subsys;
+       const char *name;
+
+       name = udev_device_get_sysname(dev);
+       if (!name) {
+               pb_debug("udev_device_get_sysname failed\n");
+               return -1;
+       }
+
+       subsys = udev_device_get_subsystem(dev);
+       if (!subsys) {
+               pb_debug("udev_device_get_subsystem failed\n");
+               return -1;
+       }
+
+       if (device_lookup_by_id(udev->handler, name)) {
+               pb_debug("device %s is already present?\n", name);
+               return -1;
+       }
+
+       if (!strcmp(subsys, "block")) {
+               return udev_handle_block_add(udev, dev, name);
+       }
+
+       pb_debug("SKIP %s: unknown subsystem %s\n", name, subsys);
+       return -1;
+}
+
+
 static int udev_handle_dev_remove(struct pb_udev *udev, struct udev_device *dev)
 {
        struct discover_device *ddev;