X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=cabafb0abc76689064131e41d87ebdcb90276d19;hp=cb1c78888c299953b63fcef522d65470c146c886;hb=396bb4c3d33dfd68c5817da5e03251fbd82e2713;hpb=aee380b6d8f849c21a5cc54e5d8f2a43fb88b2f2

diff --git a/udevstart.c b/udevstart.c
index cb1c78888..cabafb0ab 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -80,15 +80,48 @@ static char *last_list[] = {
 	NULL,
 };
 
+/* list of devices that we should run first due to any one of a number of reasons */
+static char *first_list[] = {
+	"/class/mem",	/* people tend to like their memory devices around first... */
+	NULL,
+};
+
+static void add_device(char *path, char *subsys, int fake)
+{
+	char *argv[3];
+
+	/* fake argument vector and environment for callouts and dev.d/ */
+	argv[0] = "udev";
+	argv[1] = subsys;
+	argv[2] = NULL;
+
+	main_argv = argv;
+	setenv("DEVPATH", path, 1);
+	setenv("ACTION", "add", 1);
+	udev_add_device(path, subsys, fake);
+}
+
 static void exec_list(struct list_head *device_list)
 {
 	struct device *loop_device;
 	struct device *tmp_device;
+	int i;
+
+	/* handle the "first" type devices first */
+	list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
+		for (i=0; first_list[i] != NULL; i++) {
+			if (strncmp(loop_device->path, first_list[i], strlen(first_list[i])) == 0) {
+				add_device(loop_device->path, loop_device->subsys, NOFAKE);
+				list_del(&loop_device->list);
+				free(loop_device);
+				break;
+			}
+		}
+	}
 
 	/* 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;
@@ -98,14 +131,14 @@ static void exec_list(struct list_head *device_list)
 		if (found)
 			continue;
 
-		udev_add_device(loop_device->path, loop_device->subsys, NOFAKE);
+		add_device(loop_device->path, loop_device->subsys, NOFAKE);
 		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_add_device(loop_device->path, loop_device->subsys, NOFAKE);
+		add_device(loop_device->path, loop_device->subsys, NOFAKE);
 		list_del(&loop_device->list);
 		free(loop_device);
 	}
@@ -193,7 +226,7 @@ static void udev_scan_class(void)
 			dir2 = opendir(dirname);
 			if (dir2 != NULL) {
 				for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
-					char dirname2[MAX_PATHLEN-1];
+					char dirname2[MAX_PATHLEN];
 					DIR *dir3;
 					struct dirent *dent3;