/* We set a default monitor buffer size, as we may not process monitor
* events while performing device discvoery. systemd uses a 128M buffer, so
/* We set a default monitor buffer size, as we may not process monitor
* events while performing device discvoery. systemd uses a 128M buffer, so
- if (path && (strstr(path, "virtual/block/loop")
- || strstr(path, "virtual/block/ram"))) {
+ if (path && strstr(path, "virtual/block/loop")) {
cdrom = node && !!udev_device_get_property_value(dev, "ID_CDROM");
if (cdrom) {
/* CDROMs require a little initialisation, to get
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;
}
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");
/* 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 (ddev) {
pb_log("SKIP: %s UUID [%s] already present (as %s)\n",
name, uuid, ddev->device->id);
if (ddev) {
pb_log("SKIP: %s UUID [%s] already present (as %s)\n",
name, uuid, ddev->device->id);
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;
+ /* 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);
+
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 int udev_handle_dev_action(struct udev_device *dev, const char *action)
{
struct pb_udev *udev = udev_get_userdata(udev_device_get_udev(dev));
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);
+ 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__);
+ pb_debug("udev: action %s, device %s\n", action, name);
+ pb_debug("udev: properties:\n");
- 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
+ for (; list; list = udev_list_entry_get_next(list))
+ pb_debug("\t%-20s: %s\n", udev_list_entry_get_name(list),
+ udev_list_entry_get_value(list));
if (!strcmp(action, "add"))
return udev_handle_dev_add(udev, dev);
if (!strcmp(action, "add"))
return udev_handle_dev_add(udev, dev);
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);
}
-struct pb_udev *udev_init(struct waitset *waitset,
- struct device_handler *handler)
+struct pb_udev *udev_init(struct device_handler *handler,
+ struct waitset *waitset)
waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
udev_process, udev->monitor);
waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
udev_process, udev->monitor);