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) {
/* If our environment's udev can recognise them explictly skip any
* device mapper devices we encounter */
- const char *devname = udev_device_get_property_value(dev, "DM_NAME");
+ devname = udev_device_get_property_value(dev, "DM_NAME");
if (devname) {
- pb_log("SKIP: dm-device %s\n", devname);
+ pb_debug("SKIP: dm-device %s\n", devname);
return 0;
}
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);
- if (ddev->device->type == DEVICE_TYPE_DISK)
+ /* Create a snapshot for all disk devices */
+ if ((ddev->device->type == DEVICE_TYPE_DISK ||
+ ddev->device->type == DEVICE_TYPE_USB))
devmapper_init_snapshot(udev->handler, ddev);
device_handler_discover(udev->handler, ddev);
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)
return 0;
}
+#ifdef UDEV_LOGGING
static void udev_log_fn(struct udev __attribute__((unused)) *udev,
int __attribute__((unused)) priority, const char *file, int line,
const char *fn, const char *format, va_list args)
pb_log("libudev: %s %s:%d: ", fn, file, line);
vfprintf(pb_log_get_stream(), format, args);
}
+#endif
struct pb_udev *udev_init(struct device_handler *handler,
struct waitset *waitset)
udev_set_userdata(udev->udev, udev);
+#ifdef UDEV_LOGGING
udev_set_log_fn(udev->udev, udev_log_fn);
+#endif
result = udev_setup_monitor(udev->udev, &udev->monitor);
if (result)