X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=48ab745b4f371ac410048dc3ab7b93f9dc3ff4fb;hp=1c5cf71ff4fee7caf0949211ba4c0f7ee48afd37;hb=b8e53cb4b96eb17dc7fa0ffc505dfebae37e6cbf;hpb=f611bde3f182e9a4befb48a0160d1831708aca67

diff --git a/discover/udev.c b/discover/udev.c
index 1c5cf71..48ab745 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -23,15 +23,6 @@
 #include "pb-discover.h"
 #include "device-handler.h"
 
-#if defined(DEBUG)
-#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args)
-#define DBGS(fmt, args...) \
-	pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
-#else
-#define DBG(fmt, args...)
-#define DBGS(fmt, args...)
-#endif
-
 struct pb_udev {
 	struct udev *udev;
 	struct udev_monitor *monitor;
@@ -70,8 +61,10 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
 {
 	struct discover_device *ddev;
 	const char *typestr;
+	const char *serial;
 	const char *path;
 	const char *name;
+	const char *prop;
 
 	name = udev_device_get_sysname(dev);
 	if (!name) {
@@ -104,16 +97,26 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
 		return -1;
 	}
 
+	/* we may also see multipath devices; same dev nodes (hence id), but
+	 * different serial numbers */
+	serial = udev_device_get_property_value(dev, "ID_SERIAL");
+	if (serial && device_lookup_by_serial(udev->handler, serial))
+		return -1;
+
 	ddev = discover_device_create(udev->handler, name);
 
 	ddev->device_path = udev_device_get_devnode(dev);
-	ddev->uuid = udev_device_get_property_value(dev, "ID_FS_UUID");
-	ddev->label = udev_device_get_property_value(dev, "ID_FS_LABEL");
+	prop = udev_device_get_property_value(dev, "ID_FS_UUID");
+	if (prop)
+		ddev->uuid = talloc_strdup(ddev, prop);
+	prop = udev_device_get_property_value(dev, "ID_FS_LABEL");
+	if (prop)
+		ddev->label = talloc_strdup(ddev, prop);
 	ddev->device->type = DEVICE_TYPE_DISK;
 
 	udev_setup_device_params(dev, ddev);
 
-	device_handler_discover(udev->handler, ddev, CONF_METHOD_LOCAL_FILE);
+	device_handler_discover(udev->handler, ddev);
 
 	return 0;
 }
@@ -311,7 +314,7 @@ struct pb_udev *udev_init(struct waitset *waitset,
 	waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
 		udev_process, udev->monitor);
 
-	pb_log("%s: waiting on udev\n", __func__);
+	pb_debug("%s: waiting on udev\n", __func__);
 
 	return udev;