X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=75393d51768cb9ab1782112a71c7c8d4f4cd4fdc;hp=320dffd03c1676d5f401153bb24ed80bb3c21e55;hb=acc5ace6e58db2f3dceb1f7a27d0fc1fb29c4a27;hpb=edcfca78ac49793e295ac97328942321f39e3996

diff --git a/discover/udev.c b/discover/udev.c
index 320dffd..75393d5 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -25,6 +25,7 @@
 #include "pb-discover.h"
 #include "device-handler.h"
 #include "cdrom.h"
+#include "devmapper.h"
 
 /* We set a default monitor buffer size, as we may not process monitor
  * events while performing device discvoery. systemd uses a 128M buffer, so
@@ -41,11 +42,15 @@ static int udev_destructor(void *p)
 {
 	struct pb_udev *udev = p;
 
-	udev_monitor_unref(udev->monitor);
-	udev->monitor = NULL;
+	if (udev->monitor) {
+		udev_monitor_unref(udev->monitor);
+		udev->monitor = NULL;
+	}
 
-	udev_unref(udev->udev);
-	udev->udev = NULL;
+	if (udev->udev) {
+		udev_unref(udev->udev);
+		udev->udev = NULL;
+	}
 
 	return 0;
 }
@@ -90,12 +95,16 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 
 	node = udev_device_get_devnode(dev);
 	path = udev_device_get_devpath(dev);
-	if (path && (strstr(path, "virtual/block/loop")
-			|| strstr(path, "virtual/block/ram"))) {
+	if (path && strstr(path, "virtual/block/loop")) {
 		pb_log("SKIP: %s: ignored (path=%s)\n", name, path);
 		return 0;
 	}
 
+	if (path && strstr(path, "virtual/block/ram")) {
+		device_handler_add_ramdisk(udev->handler, node);
+		return 0;
+	}
+
 	cdrom = node && !!udev_device_get_property_value(dev, "ID_CDROM");
 	if (cdrom) {
 		/* CDROMs require a little initialisation, to get
@@ -107,6 +116,14 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 		}
 	}
 
+	/* If our environment's udev can recognise them explictly skip any
+	 * device mapper devices we encounter */
+	const char *devname = udev_device_get_property_value(dev, "DM_NAME");
+	if (devname) {
+		pb_log("SKIP: dm-device %s\n", devname);
+		return 0;
+	}
+
 	type = udev_device_get_property_value(dev, "ID_FS_TYPE");
 	if (!type) {
 		pb_log("SKIP: %s: no ID_FS_TYPE property\n", name);
@@ -138,6 +155,9 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 
 	udev_setup_device_params(dev, ddev);
 
+	if (ddev->device->type == DEVICE_TYPE_DISK)
+		devmapper_init_snapshot(udev->handler, ddev);
+
 	device_handler_discover(udev->handler, ddev);
 
 	return 0;
@@ -263,23 +283,18 @@ static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev)
 static int udev_handle_dev_action(struct udev_device *dev, const char *action)
 {
 	struct pb_udev *udev = udev_get_userdata(udev_device_get_udev(dev));
+	struct udev_list_entry *list;
+	const char *name;
 
-#ifdef DEBUG
-	{
-		struct udev_list_entry *list;
-		const char *name;
+	list = udev_device_get_properties_list_entry(dev);
+	name = udev_device_get_sysname(dev);
 
-		list = udev_device_get_properties_list_entry(dev);
-		name = udev_device_get_sysname(dev);
+	pb_debug("udev: action %s, device %s\n", action, name);
+	pb_debug("udev: properties:\n");
 
-		pb_debug("%s: action %s, device %s\n", __func__, action, name);
-		pb_debug("%s properties:\n", __func__);
-
-		for (; list; list = udev_list_entry_get_next(list))
-			pb_log("\t%-20s: %s\n", udev_list_entry_get_name(list),
-					udev_list_entry_get_value(list));
-	} while (0);
-#endif
+	for (; list; list = udev_list_entry_get_next(list))
+		pb_debug("\t%-20s: %s\n", udev_list_entry_get_name(list),
+				udev_list_entry_get_value(list));
 
 	if (!strcmp(action, "add"))
 		return udev_handle_dev_add(udev, dev);
@@ -322,11 +337,6 @@ static int udev_enumerate(struct udev *udev)
 
 	list = udev_enumerate_get_list_entry(enumerate);
 
-	if (!list) {
-		pb_log("udev_enumerate_get_list_entry failed\n");
-		goto fail;
-	}
-
 	udev_list_entry_foreach(entry, list) {
 		const char *syspath;
 		struct udev_device *dev;
@@ -431,7 +441,7 @@ struct pb_udev *udev_init(struct device_handler *handler,
 	struct pb_udev *udev;
 	int result;
 
-	udev = talloc(handler, struct pb_udev);
+	udev = talloc_zero(handler, struct pb_udev);
 	talloc_set_destructor(udev, udev_destructor);
 	udev->handler = handler;
 
@@ -439,7 +449,7 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
 	if (!udev->udev) {
 		pb_log("udev_new failed\n");
-		goto fail_new;
+		goto fail;
 	}
 
 	udev_set_userdata(udev->udev, udev);
@@ -448,11 +458,11 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
 	result = udev_setup_monitor(udev->udev, &udev->monitor);
 	if (result)
-		goto fail_monitor;
+		goto fail;
 
 	result = udev_enumerate(udev->udev);
 	if (result)
-		goto fail_enumerate;
+		goto fail;
 
 	waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
 		udev_process, udev->monitor);
@@ -461,11 +471,13 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
 	return udev;
 
-fail_monitor:
-	udev_monitor_unref(udev->monitor);
-fail_enumerate:
-	udev_unref(udev->udev);
-fail_new:
+fail:
 	talloc_free(udev);
 	return NULL;
 }
+
+void udev_reinit(struct pb_udev *udev)
+{
+	pb_log("udev: reinit requested, starting enumeration\n");
+	udev_enumerate(udev->udev);
+}