[PATCH] make a "last list" of devices for udevstart to operate on last.

Should fix the dm startup issues, hopefully...

diff --git a/udevstart.c b/udevstart.c
index 2d11edeca2d6fd291e5d6985c47bcbf48274f0ca..6f90de7d18450be31db3b65ee6d7bef676256183 100644 (file)
--- 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;
@@ -62,6 +94,7 @@ static void udev_exec(const char *path, const char* subsystem)
        char nosleep[] = "UDEV_NO_SLEEP=1";
        char *env[] = { action, devpath, nosleep, NULL };
 
+       return;
        strcpy(devpath, "DEVPATH=");
        strfieldcat(devpath, path);
 
@@ -81,19 +114,50 @@ 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);
 
-       /* 
-        * We want to scan the class tree first as lvm and dm needs to be able
-        * to have access to the char control device when probing the block
-        * devices.
-        */
-       devpath = "class";
-       dir = opendir(SYSCLASS);
+       dir = opendir(SYSBLOCK);
        if (dir != NULL) {
                for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
                        char dirname[MAX_PATHLEN];
@@ -104,12 +168,15 @@ static void udev_scan(void)
                            (strcmp(dent->d_name, "..") == 0))
                                continue;
 
-                       snprintf(dirname, MAX_PATHLEN, "%s/%s", SYSCLASS, dent->d_name);
-                       dirname[MAX_PATHLEN] = '\0';
+                       snprintf(dirname, MAX_PATHLEN, "/block/%s", dent->d_name);
+                       dirname[MAX_PATHLEN-1] = '\0';
+                       device_list_insert(dirname, "block", &device_list);
+
+                       snprintf(dirname, MAX_PATHLEN, "%s/%s", SYSBLOCK, dent->d_name);
                        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;
 
@@ -126,10 +193,10 @@ static void udev_scan(void)
                                                        char filename[MAX_PATHLEN];
 
                                                        if (strcmp(dent3->d_name, "dev") == 0) {
-                                                               snprintf(filename, MAX_PATHLEN, "/class/%s/%s",
+                                                               snprintf(filename, MAX_PATHLEN, "/block/%s/%s",
                                                                         dent->d_name, dent2->d_name);
                                                                filename[MAX_PATHLEN-1] = '\0';
-                                                               udev_exec(filename, dent->d_name);
+                                                               device_list_insert(filename, "block", &device_list);
                                                        }
                                                }
                                                closedir(dir3);
@@ -141,8 +208,16 @@ static void udev_scan(void)
                closedir(dir);
        }
 
-       devpath = "block";
-       dir = opendir(SYSBLOCK);
+       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)) {
                        char dirname[MAX_PATHLEN];
@@ -153,15 +228,12 @@ static void udev_scan(void)
                            (strcmp(dent->d_name, "..") == 0))
                                continue;
 
-                       snprintf(dirname, MAX_PATHLEN, "/block/%s", dent->d_name);
-                       dirname[MAX_PATHLEN-1] = '\0';
-                       udev_exec(dirname, "block");
-
-                       snprintf(dirname, MAX_PATHLEN, "%s/%s", SYSBLOCK, dent->d_name);
+                       snprintf(dirname, MAX_PATHLEN, "%s/%s", SYSCLASS, dent->d_name);
+                       dirname[MAX_PATHLEN] = '\0';
                        dir2 = opendir(dirname);
                        if (dir2 != NULL) {
                                for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
-                                       char dirname2[MAX_PATHLEN];
+                                       char dirname2[MAX_PATHLEN-1];
                                        DIR *dir3;
                                        struct dirent *dent3;
 
@@ -178,10 +250,10 @@ static void udev_scan(void)
                                                        char filename[MAX_PATHLEN];
 
                                                        if (strcmp(dent3->d_name, "dev") == 0) {
-                                                               snprintf(filename, MAX_PATHLEN, "/block/%s/%s",
+                                                               snprintf(filename, MAX_PATHLEN, "/class/%s/%s",
                                                                         dent->d_name, dent2->d_name);
                                                                filename[MAX_PATHLEN-1] = '\0';
-                                                               udev_exec(filename, "block");
+                                                               device_list_insert(filename, dent->d_name, &device_list);
                                                        }
                                                }
                                                closedir(dir3);
@@ -192,13 +264,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;
 }