fixups to get back to proper patch order

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index efeb1b505073f3f258c86b2d2ced20592bf1d394..35fa533a4e76d6f49747cd9c12b7dd9d7ef596af 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -33,7 +33,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
 #include "namedev.h"
@@ -179,9 +179,9 @@ int main(int argc, char *argv[], char *envp[])
                        retval = udev_add_device(&udev, class_dev);
 
                        /* run dev.d/ scripts if we created a node or changed a netif name */
-                       if (udev.devname[0] != '\0') {
+                       if (udev_dev_d && udev.devname[0] != '\0') {
                                setenv("DEVNAME", udev.devname, 1);
-                               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                        }
 
                        sysfs_close_class_device(class_dev);
@@ -192,14 +192,10 @@ int main(int argc, char *argv[], char *envp[])
                        /* get node from db, remove db-entry, delete created node */
                        retval = udev_remove_device(&udev);
 
-                       /* Set the DEVNAME if known */
-                       if (udev.devname[0] != '\0') {
-                               setenv("DEVNAME", udev.devname, 1);
-                       }
                        /* run dev.d/ scripts if we're not instructed to ignore the event */
-                       if (udev.devname[0] != '\0') {
+                       if (udev_dev_d && udev.devname[0] != '\0') {
                                setenv("DEVNAME", udev.devname, 1);
-                               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                        }
 
                }
@@ -228,7 +224,7 @@ int main(int argc, char *argv[], char *envp[])
 
 hotplug:
        if (manage_hotplug_event())
-               dev_d_execute(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
+               udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
 exit:
        logging_close();