X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=7db36a7de5f3777428951f9312c0c78de0b62b8a;hp=0b2ec2fd905d3da2bad341a26653c738f68da2a8;hb=16ab363fe5bc4393b5dd7b9c12bbd6e5b55a22fe;hpb=34c5230774ee2797b9f80b7f483e009cbb9f25f5

diff --git a/discover/udev.c b/discover/udev.c
index 0b2ec2f..7db36a7 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -26,6 +26,11 @@
 #include "device-handler.h"
 #include "cdrom.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
+ * we'll do the same here */
+static const int monitor_bufsize = 128 * 1024 * 1024;
+
 struct pb_udev {
 	struct udev *udev;
 	struct udev_monitor *monitor;
@@ -69,6 +74,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 	const char *path;
 	const char *node;
 	const char *prop;
+	const char *type;
 	bool cdrom;
 
 	typestr = udev_device_get_devtype(dev);
@@ -78,7 +84,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 	}
 
 	if (!(!strcmp(typestr, "disk") || !strcmp(typestr, "partition"))) {
-		pb_debug("SKIP %s: invalid type %s\n", name, typestr);
+		pb_log("SKIP %s: invalid type %s\n", name, typestr);
 		return 0;
 	}
 
@@ -86,7 +92,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 	path = udev_device_get_devpath(dev);
 	if (path && (strstr(path, "virtual/block/loop")
 			|| strstr(path, "virtual/block/ram"))) {
-		pb_debug("SKIP: %s: ignored (path=%s)\n", name, path);
+		pb_log("SKIP: %s: ignored (path=%s)\n", name, path);
 		return 0;
 	}
 
@@ -96,11 +102,16 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 		 * petitboot-compatible tray behaviour */
 		cdrom_init(node);
 		if (!cdrom_media_present(node)) {
-			pb_debug("SKIP: %s: no media present\n", name);
+			pb_log("SKIP: %s: no media present\n", name);
 			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;
+	}
 
 	/* We may see multipath devices; they'll have the same uuid as an
 	 * existing device, so only parse the first. */
@@ -110,7 +121,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 		if (ddev) {
 			pb_log("SKIP: %s UUID [%s] already present (as %s)\n",
 					name, uuid, ddev->device->id);
-			return -1;
+			return 0;
 		}
 	}
 
@@ -158,7 +169,7 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
 		return udev_handle_block_add(udev, dev, name);
 	}
 
-	pb_debug("SKIP %s: unknown subsystem %s\n", name, subsys);
+	pb_log("SKIP %s: unknown subsystem %s\n", name, subsys);
 	return -1;
 }
 
@@ -349,6 +360,12 @@ static int udev_setup_monitor(struct udev *udev, struct udev_monitor **monitor)
 		goto out_err;
 	}
 
+	result = udev_monitor_set_receive_buffer_size(m, monitor_bufsize);
+	if (result) {
+		pb_log("udev_monitor_set_rx_bufsize(%d) failed\n",
+			monitor_bufsize);
+	}
+
 	result = udev_monitor_filter_add_match_subsystem_devtype(m, "block",
 		NULL);
 
@@ -381,10 +398,8 @@ static int udev_process(void *arg)
 	struct udev_monitor *monitor = arg;
 	struct udev_device *dev;
 	const char *action;
-	int result;
 
 	dev = udev_monitor_receive_device(monitor);
-
 	if (!dev) {
 		pb_log("udev_monitor_receive_device failed\n");
 		return -1;
@@ -394,17 +409,12 @@ static int udev_process(void *arg)
 
 	if (!action) {
 		pb_log("udev_device_get_action failed\n");
-		goto fail;
+	} else {
+		udev_handle_dev_action(dev, action);
 	}
 
-	result = udev_handle_dev_action(dev, action);
-
-	udev_device_unref(dev);
-	return result;
-
-fail:
 	udev_device_unref(dev);
-	return -1;
+	return 0;
 }
 
 static void udev_log_fn(struct udev __attribute__((unused)) *udev,
@@ -415,12 +425,13 @@ static void udev_log_fn(struct udev __attribute__((unused)) *udev,
       vfprintf(pb_log_get_stream(), format, args);
 }
 
-struct pb_udev *udev_init(struct waitset *waitset,
-	struct device_handler *handler)
+struct pb_udev *udev_init(struct device_handler *handler,
+		struct waitset *waitset)
 {
+	struct pb_udev *udev;
 	int result;
-	struct pb_udev *udev = talloc(NULL, struct pb_udev);
 
+	udev = talloc(handler, struct pb_udev);
 	talloc_set_destructor(udev, udev_destructor);
 	udev->handler = handler;
 
@@ -459,7 +470,8 @@ fail_new:
 	return NULL;
 }
 
-void udev_destroy(struct pb_udev *udev)
+void udev_reinit(struct pb_udev *udev)
 {
-	talloc_free(udev);
+	pb_log("udev: reinit requested, starting enumeration\n");
+	udev_enumerate(udev->udev);
 }