X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=87a3748fe2f622749e3b65151d25d89b679db293;hp=6ccb8d4ba42917aed8669cf4e78bff03cc500a6e;hb=61e30136d88c1e2cef353e09789dbb969be64f55;hpb=b6ee414890fcd582a96f4d89e648cff5dacb1cb9

diff --git a/discover/udev.c b/discover/udev.c
index 6ccb8d4..87a3748 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
@@ -73,12 +74,20 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 		const char *name)
 {
 	struct discover_device *ddev;
+	unsigned int i = 0;
 	const char *typestr;
 	const char *uuid;
 	const char *path;
 	const char *node;
 	const char *prop;
 	const char *type;
+	const char *devname;
+	const char *ignored_types[] = {
+		"linux_raid_member",
+		"swap",
+		"LVM2_member",
+		NULL,
+	};
 	bool cdrom;
 
 	typestr = udev_device_get_devtype(dev);
@@ -94,12 +103,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
@@ -111,12 +124,28 @@ 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 */
+	devname = udev_device_get_property_value(dev, "DM_NAME");
+	if (devname) {
+		pb_debug("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);
 		return 0;
 	}
 
+	while (ignored_types[i]) {
+		if (!strncmp(type, ignored_types[i], strlen(ignored_types[i]))) {
+			pb_log("SKIP: %s: ignore '%s' filesystem\n", name, type);
+			return 0;
+		}
+		i++;
+	}
+
 	/* We may see multipath devices; they'll have the same uuid as an
 	 * existing device, so only parse the first. */
 	uuid = udev_device_get_property_value(dev, "ID_FS_UUID");
@@ -142,6 +171,11 @@ 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 */
+	if (ddev->device->type == DEVICE_TYPE_DISK &&
+	    !udev_device_get_property_value(dev, "MD_LEVEL"))
+		devmapper_init_snapshot(udev->handler, ddev);
+
 	device_handler_discover(udev->handler, ddev);
 
 	return 0;