X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fudev.c;h=23057bfcfdca0cd7f885e7299f4f2ede48d6d1fb;hb=8569abdf356aa617ebdcb426aa708a0fd8129a1a;hp=6cc718ea4614f9da6e7110fd9901144c5f37fb7c;hpb=5acb43464206348b7cced9508852fdd2989aea58;p=petitboot

diff --git a/discover/udev.c b/discover/udev.c
index 6cc718e..23057bf 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -176,10 +176,9 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 
 	udev_setup_device_params(dev, ddev);
 
-	/* Create a snapshot for all disks, unless it is an assembled RAID array */
+	/* Create a snapshot for all disk devices */
 	if ((ddev->device->type == DEVICE_TYPE_DISK ||
-	     ddev->device->type == DEVICE_TYPE_USB) &&
-	    !udev_device_get_property_value(dev, "MD_LEVEL"))
+	     ddev->device->type == DEVICE_TYPE_USB))
 		devmapper_init_snapshot(udev->handler, ddev);
 
 	device_handler_discover(udev->handler, ddev);
@@ -245,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
@@ -260,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)