udevd: allow starting of udevd with stopped exec-queue

[elogind.git] / udevstart.c

diff --git a/udevstart.c b/udevstart.c
index a862dadf88c2818a365ef9b7a1ed860d4e5f6df9..bd91e96f6afcad2f3f198e0804e558540fcdaafc 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -37,6 +37,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev_libc_wrapper.h"
+#include "udev_sysfs.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
@@ -110,28 +111,44 @@ static int add_device(const char *path, const char *subsystem)
        const char *devpath;
 
        devpath = &path[strlen(sysfs_path)];
-
-       /* set environment for callouts and dev.d/ */
        setenv("DEVPATH", devpath, 1);
        setenv("SUBSYSTEM", subsystem, 1);
-
        dbg("exec: '%s' (%s)\n", devpath, path);
 
        class_dev = sysfs_open_class_device_path(path);
        if (class_dev == NULL) {
-               dbg ("sysfs_open_class_device_path failed");
-               return -ENODEV;
+               dbg("sysfs_open_class_device_path failed");
+               return -1;
        }
 
-       udev_init_device(&udev, devpath, subsystem);
-       udev_add_device(&udev, class_dev);
+       udev_init_device(&udev, devpath, subsystem, "add");
+       udev.devt = get_devt(class_dev);
+       if (!udev.devt) {
+               dbg("sysfs_open_class_device_path failed");
+               return -1;
+       }
+       udev_rules_get_name(&udev, class_dev);
+       if (udev.ignore_device) {
+               dbg("device event will be ignored");
+               goto exit;
+       }
+       if (udev.name[0] == '\0') {
+               dbg("device node creation supressed");
+               goto run;
+       }
 
-       /* run dev.d/ scripts if we created a node or changed a netif name */
-       if (udev_dev_d && udev.devname[0] != '\0') {
+       udev_add_device(&udev, class_dev);
+       if (udev.devname[0] != '\0')
                setenv("DEVNAME", udev.devname, 1);
-               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
-       }
+run:
+       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);
+       }
+exit:
        sysfs_close_class_device(class_dev);
        udev_cleanup_device(&udev);