discover/devmapper: Read device size from sysfs

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index 87a3748fe2f622749e3b65151d25d89b679db293..23057bfcfdca0cd7f885e7299f4f2ede48d6d1fb 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -88,7 +88,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
                "LVM2_member",
                NULL,
        };
-       bool cdrom;
+       bool cdrom, usb;
 
        typestr = udev_device_get_devtype(dev);
        if (!typestr) {
@@ -167,13 +167,18 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
        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 &&
-           !udev_device_get_property_value(dev, "MD_LEVEL"))
+       /* 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);
@@ -239,13 +244,12 @@ static bool udev_handle_cdrom_events(struct pb_udev *udev,
                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
@@ -254,7 +258,6 @@ static bool udev_handle_cdrom_events(struct pb_udev *udev,
                if (ddev) {
                        eject = ddev->mounted;
                        udev_handle_dev_remove(udev, dev);
-                       return false;
                }
 
                if (eject)