/* If our environment's udev can recognise them explictly skip any
* device mapper devices we encounter */
/* If our environment's udev can recognise them explictly skip any
* device mapper devices we encounter */
+ 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");
/* 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);
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;
devmapper_init_snapshot(udev->handler, ddev);
device_handler_discover(udev->handler, ddev);
devmapper_init_snapshot(udev->handler, ddev);
device_handler_discover(udev->handler, ddev);
node = udev_device_get_devnode(dev);
/* handle CDROM eject requests */
if (udev_device_get_property_value(dev, "DISK_EJECT_REQUEST")) {
node = udev_device_get_devnode(dev);
/* handle CDROM eject requests */
if (udev_device_get_property_value(dev, "DISK_EJECT_REQUEST")) {
pb_debug("udev: eject request\n");
/* If the device is mounted, cdrom_id's own eject request may
pb_debug("udev: eject request\n");
/* If the device is mounted, cdrom_id's own eject request may
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)
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);
}
pb_log("libudev: %s %s:%d: ", fn, file, line);
vfprintf(pb_log_get_stream(), format, args);
}