From 70907c3fc4b344d00ce900e6a536e9cc16a35216 Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Fri, 21 Aug 2015 15:18:48 +1000 Subject: Recognise storage devices on USB bus Users may want to prioritise USB-attached storage devices differently to other devices. Detect if a device is USB-attached and add a new device type to identify it. Signed-off-by: Samuel Mendoza-Jonas --- discover/udev.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'discover/udev.c') diff --git a/discover/udev.c b/discover/udev.c index 87a3748..6cc718e 100644 --- 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,12 +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 && + 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); -- cgit v1.2.1