]> git.ozlabs.org Git - petitboot/blobdiff - discover/udev.c
discover: fix return value for discover_device_get_param
[petitboot] / discover / udev.c
index 0c656f35f3d707189ad6200c75426d8cb0c94f6b..e3495e99efe7f6f69ad33ba42dae26c07c2900d6 100644 (file)
@@ -1,5 +1,7 @@
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -22,6 +24,7 @@
 #include "udev.h"
 #include "pb-discover.h"
 #include "device-handler.h"
+#include "cdrom.h"
 
 struct pb_udev {
        struct udev *udev;
@@ -57,20 +60,16 @@ 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;
-
-       name = udev_device_get_sysname(dev);
-       if (!name) {
-               pb_debug("udev_device_get_sysname failed\n");
-               return -1;
-       }
+       bool cdrom;
 
        typestr = udev_device_get_devtype(dev);
        if (!typestr) {
@@ -83,6 +82,7 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
                return 0;
        }
 
+       node = udev_device_get_devnode(dev);
        path = udev_device_get_devpath(dev);
        if (path && (strstr(path, "virtual/block/loop")
                        || strstr(path, "virtual/block/ram"))) {
@@ -90,37 +90,79 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
                return 0;
        }
 
-       /* 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;
+       cdrom = node && !!udev_device_get_property_value(dev, "ID_CDROM");
+       if (cdrom) {
+               /* CDROMs require a little initialisation, to get
+                * petitboot-compatible tray behaviour */
+               cdrom_init(node);
+               if (!cdrom_media_present(node)) {
+                       pb_debug("SKIP: %s: no media present\n", name);
+                       return 0;
+               }
        }
 
-       /* 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 = udev_device_get_devnode(dev);
-       prop = udev_device_get_property_value(dev, "ID_FS_UUID");
-       if (prop)
-               ddev->uuid = talloc_strdup(ddev, prop);
+       ddev->device_path = talloc_strdup(ddev, node);
+
+       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);
 
-       device_handler_discover(udev->handler, ddev, CONF_METHOD_LOCAL_FILE);
+       device_handler_discover(udev->handler, ddev);
 
        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;
@@ -140,16 +182,80 @@ static int udev_handle_dev_remove(struct pb_udev *udev, struct udev_device *dev)
 
        return 0;
 }
+
+static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev)
+{
+       struct discover_device *ddev;
+       const char *name, *node;
+
+       name = udev_device_get_sysname(dev);
+       node = udev_device_get_devnode(dev);
+
+       /* we're only interested in CDROM change events at present */
+       if (!udev_device_get_property_value(dev, "ID_CDROM"))
+               return 0;
+
+       /* handle CDROM eject requests */
+       if (udev_device_get_property_value(dev, "DISK_EJECT_REQUEST")) {
+               bool eject = false;
+
+               pb_debug("udev: eject request\n");
+
+               /* If the device is mounted, cdrom_id's own eject request may
+                * have failed. So, we'll need to do our own here.
+                */
+               ddev = device_lookup_by_id(udev->handler, name);
+               if (ddev) {
+                       eject = ddev->mounted;
+                       udev_handle_dev_remove(udev, dev);
+               }
+
+               if (eject)
+                       cdrom_eject(node);
+
+               return 0;
+       }
+
+       if (udev_device_get_property_value(dev, "DISK_MEDIA_CHANGE")) {
+               if (cdrom_media_present(node))
+                       return udev_handle_dev_add(udev, dev);
+               else
+                       return udev_handle_dev_remove(udev, dev);
+       }
+
+       return 0;
+}
+
 static int udev_handle_dev_action(struct udev_device *dev, const char *action)
 {
        struct pb_udev *udev = udev_get_userdata(udev_device_get_udev(dev));
 
+#ifdef DEBUG
+       {
+               struct udev_list_entry *list;
+               const char *name;
+
+               list = udev_device_get_properties_list_entry(dev);
+               name = udev_device_get_sysname(dev);
+
+               pb_debug("%s: action %s, device %s\n", __func__, action, name);
+               pb_debug("%s properties:\n", __func__);
+
+               for (; list; list = udev_list_entry_get_next(list))
+                       pb_log("\t%-20s: %s\n", udev_list_entry_get_name(list),
+                                       udev_list_entry_get_value(list));
+       } while (0);
+#endif
+
        if (!strcmp(action, "add"))
                return udev_handle_dev_add(udev, dev);
 
        else if (!strcmp(action, "remove"))
                return udev_handle_dev_remove(udev, dev);
 
+       else if (!strcmp(action, "change"))
+               return udev_handle_dev_change(udev, dev);
+
        return 0;
 }