X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=19f588ab33093689f27d46a01657d9f4ff18b520;hp=1d9b60464c32749c2a72050996dfd9a29500a7b3;hb=fd87429578a01e8cc0c9ca4b54f458280808adfb;hpb=e13fa59953d64e478025fd1200bb5fd0baf671b2

diff --git a/udevstart.c b/udevstart.c
index 1d9b60464..19f588ab3 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -23,6 +23,7 @@
  */
 
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -34,6 +35,7 @@
 
 #include "logging.h"
 #include "udev_lib.h"
+#include "list.h"
 
 
 #ifdef LOG
@@ -54,6 +56,36 @@ void log_message(int level, const char *format, ...)
 #define SYSCLASS		"/sys/class"
 #define UDEV_BIN		"/sbin/udev"
 
+struct device {
+	struct list_head list;
+	char path[MAX_PATHLEN];
+	char subsys[MAX_PATHLEN];
+};
+
+/* sort files in lexical order */
+static int device_list_insert(char *path, char *subsystem, struct list_head *device_list)
+{
+	struct device *loop_device;
+	struct device *new_device;
+
+	list_for_each_entry(loop_device, device_list, list) {
+		if (strcmp(loop_device->path, path) > 0) {
+			break;
+		}
+	}
+
+	new_device = malloc(sizeof(struct device));
+	if (new_device == NULL) {
+		dbg("error malloc");
+		return -ENOMEM;
+	}
+
+	strfieldcpy(new_device->path, path);
+	strfieldcpy(new_device->subsys, subsystem);
+	list_add_tail(&new_device->list, &loop_device->list);
+	return 0;
+}
+
 static void udev_exec(const char *path, const char* subsystem)
 {
 	pid_t pid;
@@ -81,13 +113,49 @@ static void udev_exec(const char *path, const char* subsystem)
 	}
 }
 
-static void udev_scan(void)
+/* list of devices that we should run last due to any one of a number of reasons */
+static char *last_list[] = {
+	"/block/dm",	/* on here because dm wants to have the block devices around before it */
+	NULL,
+};
+
+static void exec_list(struct list_head *device_list)
+{
+	struct device *loop_device;
+	struct device *tmp_device;
+
+	/* handle the devices we are allowed to, excluding the "last" type devices */
+	list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
+		int found = 0;
+		int i;
+		for (i=0; last_list[i] != NULL; i++) {
+			if (strncmp(loop_device->path, last_list[i], strlen(last_list[i])) == 0) {
+				found = 1;
+				break;
+			}
+		}
+		if (found)
+			continue;
+
+		udev_exec(loop_device->path, loop_device->subsys);
+		list_del(&loop_device->list);
+		free(loop_device);
+	}
+
+	/* handle the rest of the devices left over, if any */
+	list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
+		udev_exec(loop_device->path, loop_device->subsys);
+		list_del(&loop_device->list);
+		free(loop_device);
+	}
+}
+
+static void udev_scan_block(void)
 {
-	char *devpath;
 	DIR *dir;
 	struct dirent *dent;
+	LIST_HEAD(device_list);
 
-	devpath = "block";
 	dir = opendir(SYSBLOCK);
 	if (dir != NULL) {
 		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
@@ -101,7 +169,7 @@ static void udev_scan(void)
 
 			snprintf(dirname, MAX_PATHLEN, "/block/%s", dent->d_name);
 			dirname[MAX_PATHLEN-1] = '\0';
-			udev_exec(dirname, "block");
+			device_list_insert(dirname, "block", &device_list);
 
 			snprintf(dirname, MAX_PATHLEN, "%s/%s", SYSBLOCK, dent->d_name);
 			dir2 = opendir(dirname);
@@ -127,7 +195,7 @@ static void udev_scan(void)
 								snprintf(filename, MAX_PATHLEN, "/block/%s/%s",
 									 dent->d_name, dent2->d_name);
 								filename[MAX_PATHLEN-1] = '\0';
-								udev_exec(filename, "block");
+								device_list_insert(filename, "block", &device_list);
 							}
 						}
 						closedir(dir3);
@@ -139,7 +207,15 @@ static void udev_scan(void)
 		closedir(dir);
 	}
 
-	devpath = "class";
+	exec_list(&device_list);
+}
+
+static void udev_scan_class(void)
+{
+	DIR *dir;
+	struct dirent *dent;
+	LIST_HEAD(device_list);
+
 	dir = opendir(SYSCLASS);
 	if (dir != NULL) {
 		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
@@ -176,7 +252,7 @@ static void udev_scan(void)
 								snprintf(filename, MAX_PATHLEN, "/class/%s/%s",
 									 dent->d_name, dent2->d_name);
 								filename[MAX_PATHLEN-1] = '\0';
-								udev_exec(filename, dent->d_name);
+								device_list_insert(filename, dent->d_name, &device_list);
 							}
 						}
 						closedir(dir3);
@@ -187,14 +263,16 @@ static void udev_scan(void)
 		}
 		closedir(dir);
 	}
-}
 
+	exec_list(&device_list);
+}
 
 int main(int argc, char *argv[], char *envp[])
 {
 	init_logging("udevstart");
 
-	udev_scan();
+	udev_scan_class();
+	udev_scan_block();
 
 	return 0;
 }