udev: move dev.d/ handling to external helper

[elogind.git] / udevstart.c

diff --git a/udevstart.c b/udevstart.c
index a862dadf88c2818a365ef9b7a1ed860d4e5f6df9..34f3835d65f3e0026805489736240b1afb3c6769 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -123,13 +123,18 @@ static int add_device(const char *path, const char *subsystem)
                return -ENODEV;
        }
 
-       udev_init_device(&udev, devpath, subsystem);
+       udev_init_device(&udev, devpath, subsystem, "add");
        udev_add_device(&udev, class_dev);
 
-       /* run dev.d/ scripts if we created a node or changed a netif name */
-       if (udev_dev_d && udev.devname[0] != '\0') {
+       if (udev.devname[0] != '\0')
                setenv("DEVNAME", udev.devname, 1);
-               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+
+       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);
        }
 
        sysfs_close_class_device(class_dev);