-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
#include <assert.h>
#include <errno.h>
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");
}
}
- /* 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);
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;
return 0;
}
-static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev)
+/* returns true if further event processing should stop (eg., we've
+ * ejected the cdrom)
+ */
+static bool udev_handle_cdrom_events(struct pb_udev *udev,
+ struct udev_device *dev, struct discover_device *ddev)
{
- struct discover_device *ddev;
- const char *name, *node;
+ const char *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;
/* 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);
+ return false;
}
if (eject)
cdrom_eject(node);
- return 0;
+ return true;
}
if (udev_device_get_property_value(dev, "DISK_MEDIA_CHANGE")) {
if (cdrom_media_present(node))
- return udev_handle_dev_add(udev, dev);
+ udev_handle_dev_add(udev, dev);
else
- return udev_handle_dev_remove(udev, dev);
+ udev_handle_dev_remove(udev, dev);
+ return true;
}
- return 0;
+ return false;
+}
+
+static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev)
+{
+ struct discover_device *ddev;
+ const char *name;
+ int rc = 0;
+
+ name = udev_device_get_sysname(dev);
+
+ ddev = device_lookup_by_id(udev->handler, name);
+
+ /* if this is a CDROM device, process eject & media change requests;
+ * these may stop further processing */
+ if (!udev_device_get_property_value(dev, "ID_CDROM")) {
+ if (udev_handle_cdrom_events(udev, dev, ddev))
+ return 0;
+ }
+
+ /* if this is a new device, treat it as an add */
+ if (!ddev)
+ rc = udev_handle_dev_add(udev, dev);
+
+ return rc;
}
static int udev_handle_dev_action(struct udev_device *dev, const char *action)
}
result = udev_enumerate_add_match_subsystem(enumerate, "block");
-
if (result) {
pb_log("udev_enumerate_add_match_subsystem failed\n");
goto fail;
}
+ result = udev_enumerate_add_match_is_initialized(enumerate);
+ if (result) {
+ pb_log("udev_enumerate_add_match_is_initialised failed\n");
+ goto fail;
+ }
+
udev_enumerate_scan_devices(enumerate);
list = udev_enumerate_get_list_entry(enumerate);
udev_set_log_fn(udev->udev, udev_log_fn);
- result = udev_enumerate(udev->udev);
-
- if (result)
- goto fail_enumerate;
-
result = udev_setup_monitor(udev->udev, &udev->monitor);
-
if (result)
goto fail_monitor;
+ result = udev_enumerate(udev->udev);
+ if (result)
+ goto fail_enumerate;
+
waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
udev_process, udev->monitor);
return udev;
fail_monitor:
+ udev_monitor_unref(udev->monitor);
fail_enumerate:
udev_unref(udev->udev);
fail_new: