udev: move dev.d/ handling to external helper

[elogind.git] / udevstart.c

diff --git a/udevstart.c b/udevstart.c
index d41702efd17a4621199509ce4a1a207dc048404b..34f3835d65f3e0026805489736240b1afb3c6769 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -126,6 +126,9 @@ static int add_device(const char *path, const char *subsystem)
        udev_init_device(&udev, devpath, subsystem, "add");
        udev_add_device(&udev, class_dev);
 
+       if (udev.devname[0] != '\0')
+               setenv("DEVNAME", udev.devname, 1);
+
        if (udev_run && !list_empty(&udev.run_list)) {
                struct name_entry *name_loop;
 
@@ -134,12 +137,6 @@ static int add_device(const char *path, const char *subsystem)
                        execute_command(name_loop->name, udev.subsystem);
        }
 
-       /* run dev.d/ scripts if we created a node or changed a netif name */
-       if (udev_dev_d && udev.devname[0] != '\0') {
-               setenv("DEVNAME", udev.devname, 1);
-               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
-       }
-
        sysfs_close_class_device(class_dev);
        udev_cleanup_device(&udev);