X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=2be4c357408d7f266da37a3b4303071f7822bfff;hp=23375b7a3e3af118f7a3a17464a01ccf681edb4c;hb=a15f42c46a7b9ceb5850ea4334c95f099ce74a6f;hpb=fb39f0566e248c09772ed15a3218ef2381700b6a

diff --git a/udev.c b/udev.c
index 23375b7a3..2be4c3574 100644
--- a/udev.c
+++ b/udev.c
@@ -54,8 +54,10 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
-/* decide if we should manage the whole hotplug event
- * for now look if the kernel calls udevsend instead of /sbin/hotplug
+/* Decide if we should manage the whole uevent, including multiplexing
+ * of the hotplug directories.
+ * For now look if the kernel calls udevsend instead of /sbin/hotplug,
+ * or the uevent-helper in /proc/sys/kernel/hotplug is empty.
  */
 static int manage_hotplug_event(void) {
 	char helper[256];
@@ -70,13 +72,15 @@ static int manage_hotplug_event(void) {
 	if (fd < 0)
 		return 0;
 
-	len = read(fd, helper, 256);
+	len = read(fd, helper, sizeof(helper)-1);
 	close(fd);
 
 	if (len < 0)
 		return 0;
 	helper[len] = '\0';
 
+	if (helper[0] == '\0' || helper[0] == '\n')
+		return 1;
 	if (strstr(helper, "udevsend"))
 		return 1;
 
@@ -157,6 +161,8 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
+		udev_rules_init();
+
 		if (strcmp(action, "add") == 0) {
 			/* wait for sysfs and possibly add node */
 			dbg("udev add");
@@ -178,9 +184,6 @@ int main(int argc, char *argv[], char *envp[])
 
 			wait_for_class_device(class_dev, &error);
 
-			/* init rules */
-			udev_rules_init();
-
 			/* name, create node, store in db */
 			retval = udev_add_device(&udev, class_dev);
 
@@ -195,16 +198,31 @@ int main(int argc, char *argv[], char *envp[])
 				goto hotplug;
 			}
 
+			udev_rules_get_run(&udev);
+			if (udev.ignore_device) {
+				dbg("device event will be ignored");
+				goto hotplug;
+			}
+
 			/* get node from db, remove db-entry, delete created node */
 			retval = udev_remove_device(&udev);
 		}
 
-		/* run dev.d/ scripts if we created/deleted a node or changed a netif name */
-		if (udev.devname[0] != '\0') {
+		if (udev.devname[0] != '\0')
 			setenv("DEVNAME", udev.devname, 1);
-			if (udev_dev_d)
-				udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+
+		if (udev_run && !list_empty(&udev.run_list)) {
+			struct name_entry *name_loop;
+
+			dbg("executing run list");
+			list_for_each_entry(name_loop, &udev.run_list, node)
+				execute_command(name_loop->name, udev.subsystem);
 		}
+
+		/* run dev.d/ scripts if we created/deleted a node or changed a netif name */
+		if (udev_dev_d && udev.devname[0] != '\0')
+			udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+
 	} else if (udev.type == DEV_DEVICE) {
 		if (strcmp(action, "add") == 0) {
 			/* wait for sysfs */