X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=1e043130c7d1c61246ba5ca1518f3076bb37c331;hp=23057bfcfdca0cd7f885e7299f4f2ede48d6d1fb;hb=c35df3e254e6dbfd69737afc781b7aae59e4ccd4;hpb=0739476294f6925b01ad12b1b198f85b41bc657d

diff --git a/discover/udev.c b/discover/udev.c
index 23057bf..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);
 
@@ -448,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)
@@ -455,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)
@@ -475,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)