#include "pb-discover.h"
#include "device-handler.h"
#include "cdrom.h"
+#include "devmapper.h"
/* We set a default monitor buffer size, as we may not process monitor
* events while performing device discvoery. systemd uses a 128M buffer, so
{
struct pb_udev *udev = p;
- udev_monitor_unref(udev->monitor);
- udev->monitor = NULL;
+ if (udev->monitor) {
+ udev_monitor_unref(udev->monitor);
+ udev->monitor = NULL;
+ }
- udev_unref(udev->udev);
- udev->udev = NULL;
+ if (udev->udev) {
+ udev_unref(udev->udev);
+ udev->udev = NULL;
+ }
return 0;
}
const char *name)
{
struct discover_device *ddev;
+ unsigned int i = 0;
const char *typestr;
const char *uuid;
const char *path;
const char *node;
const char *prop;
const char *type;
- bool cdrom;
+ const char *devname;
+ const char *ignored_types[] = {
+ "linux_raid_member",
+ "swap",
+ "LVM2_member",
+ NULL,
+ };
+ bool cdrom, usb;
typestr = udev_device_get_devtype(dev);
if (!typestr) {
node = udev_device_get_devnode(dev);
path = udev_device_get_devpath(dev);
- if (path && (strstr(path, "virtual/block/loop")
- || strstr(path, "virtual/block/ram"))) {
+ if (path && strstr(path, "virtual/block/loop")) {
pb_log("SKIP: %s: ignored (path=%s)\n", name, path);
return 0;
}
+ if (path && strstr(path, "virtual/block/ram")) {
+ device_handler_add_ramdisk(udev->handler, node);
+ return 0;
+ }
+
cdrom = node && !!udev_device_get_property_value(dev, "ID_CDROM");
if (cdrom) {
/* CDROMs require a little initialisation, to get
}
}
+ /* If our environment's udev can recognise them explictly skip any
+ * device mapper devices we encounter */
+ devname = udev_device_get_property_value(dev, "DM_NAME");
+ if (devname) {
+ pb_debug("SKIP: dm-device %s\n", devname);
+ return 0;
+ }
+
type = udev_device_get_property_value(dev, "ID_FS_TYPE");
if (!type) {
pb_log("SKIP: %s: no ID_FS_TYPE property\n", name);
return 0;
}
+ while (ignored_types[i]) {
+ if (!strncmp(type, ignored_types[i], strlen(ignored_types[i]))) {
+ pb_log("SKIP: %s: ignore '%s' filesystem\n", name, type);
+ return 0;
+ }
+ i++;
+ }
+
/* 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");
prop = udev_device_get_property_value(dev, "ID_FS_LABEL");
if (prop)
ddev->label = talloc_strdup(ddev, prop);
- ddev->device->type = cdrom ? DEVICE_TYPE_OPTICAL : DEVICE_TYPE_DISK;
+
+ usb = !!udev_device_get_property_value(dev, "ID_USB_DRIVER");
+ if (cdrom)
+ ddev->device->type = DEVICE_TYPE_OPTICAL;
+ else
+ ddev->device->type = usb ? DEVICE_TYPE_USB : DEVICE_TYPE_DISK;
udev_setup_device_params(dev, ddev);
+ /* Create a snapshot for all disks, unless it is an assembled RAID array */
+ if ((ddev->device->type == DEVICE_TYPE_DISK ||
+ ddev->device->type == DEVICE_TYPE_USB) &&
+ !udev_device_get_property_value(dev, "MD_LEVEL"))
+ devmapper_init_snapshot(udev->handler, ddev);
+
device_handler_discover(udev->handler, ddev);
return 0;
struct udev_device *dev, struct discover_device *ddev)
{
const char *node;
+ bool eject = false;
node = udev_device_get_devnode(dev);
/* 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
if (ddev) {
eject = ddev->mounted;
udev_handle_dev_remove(udev, dev);
- return false;
}
if (eject)
list = udev_enumerate_get_list_entry(enumerate);
- if (!list) {
- pb_log("udev_enumerate_get_list_entry failed\n");
- goto fail;
- }
-
udev_list_entry_foreach(entry, list) {
const char *syspath;
struct udev_device *dev;
struct pb_udev *udev;
int result;
- udev = talloc(handler, struct pb_udev);
+ udev = talloc_zero(handler, struct pb_udev);
talloc_set_destructor(udev, udev_destructor);
udev->handler = handler;
if (!udev->udev) {
pb_log("udev_new failed\n");
- goto fail_new;
+ goto fail;
}
udev_set_userdata(udev->udev, udev);
result = udev_setup_monitor(udev->udev, &udev->monitor);
if (result)
- goto fail_monitor;
+ goto fail;
result = udev_enumerate(udev->udev);
if (result)
- goto fail_enumerate;
+ goto fail;
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:
+fail:
talloc_free(udev);
return NULL;
}