ui/ncurses: Interpret left/right keys as up/down

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index 87a3748fe2f622749e3b65151d25d89b679db293..f4cefabffa22cde360a1c0ed1ebe0ba76c4a7122 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)
@@ -445,6 +448,7 @@ static int udev_process(void *arg)
        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)
@@ -452,6 +456,7 @@ static void udev_log_fn(struct udev __attribute__((unused)) *udev,
       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)
@@ -472,7 +477,9 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
        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)