[PATCH] volume_id fix

[elogind.git] / udevstart.c

diff --git a/udevstart.c b/udevstart.c
index cb1c78888c299953b63fcef522d65470c146c886..fd490f0791688ea8b0d4bd5d045f1431546e62c1 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -33,6 +33,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "logging.h"
 #include "udev_lib.h"
 #include "list.h"
@@ -80,15 +81,67 @@ 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 int add_device(char *devpath, char *subsystem)
+{
+       struct udevice udev;
+       char path[SYSFS_PATH_MAX];
+       struct sysfs_class_device *class_dev;
+       char *argv[3];
+
+       /* fake argument vector and environment for callouts and dev.d/ */
+       argv[0] = "udev";
+       argv[1] = subsystem;
+       argv[2] = NULL;
+
+       main_argv = argv;
+       setenv("DEVPATH", devpath, 1);
+       setenv("ACTION", "add", 1);
+
+       snprintf(path, SYSFS_PATH_MAX-1, "%s%s", sysfs_path, devpath);
+       class_dev = sysfs_open_class_device_path(path);
+       if (class_dev == NULL) {
+               dbg ("sysfs_open_class_device_path failed");
+               return -ENODEV;
+       }
+
+       udev_set_values(&udev, devpath, subsystem);
+       udev_add_device(&udev, class_dev);
+
+       /* run scripts */
+       dev_d_execute(&udev);
+
+       sysfs_close_class_device(class_dev);
+
+       return 0;
+}
+
 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);
+                               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 +151,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);
                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);
                list_del(&loop_device->list);
                free(loop_device);
        }
@@ -193,7 +246,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;