X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=1e043130c7d1c61246ba5ca1518f3076bb37c331;hp=6cc718ea4614f9da6e7110fd9901144c5f37fb7c;hb=b5f9e34d85075afe7aa87b5ce4a1a2d911468e36;hpb=70907c3fc4b344d00ce900e6a536e9cc16a35216

diff --git a/discover/udev.c b/discover/udev.c
index 6cc718e..1e04313 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -158,7 +158,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 		}
 	}
 
-	ddev = discover_device_create(udev->handler, name);
+	ddev = discover_device_create(udev->handler, uuid, name);
 
 	ddev->device_path = talloc_strdup(ddev, node);
 
@@ -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)
@@ -451,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)
@@ -458,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)
@@ -478,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)