[PATCH] add MANAGED_EVENT to the forked udev environment

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 300e85ceb0aa0737c74f589cc39de53e43ed6f41..605a55bf19a956e69d4258774d8e5fa1e4df07af 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -34,9 +34,8 @@
 #include "udev_lib.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
+#include "logging.h"
 
 
 #ifdef LOG
@@ -82,6 +81,10 @@ int main(int argc, char *argv[], char *envp[])
        logging_init("udev");
        udev_init_config();
 
+       /* export logging flag, callouts may want to do the same as udev */
+       if (udev_log)
+               setenv("UDEV_LOG", "1", 1);
+
        if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
                act_type = UDEVSTART;
        } else {
@@ -144,6 +147,11 @@ int main(int argc, char *argv[], char *envp[])
        switch(act_type) {
        case UDEVSTART:
                dbg("udevstart");
+
+               /* disable all logging as it's much too slow on some facilities */
+               udev_log = 0;
+               unsetenv("UDEV_LOG");
+
                namedev_init();
                retval = udev_start();
                break;
@@ -155,7 +163,7 @@ int main(int argc, char *argv[], char *envp[])
                class_dev = sysfs_open_class_device_path(path);
                if (class_dev == NULL) {
                        dbg ("sysfs_open_class_device_path failed");
-                       break;
+                       goto exit;
                }
                dbg("opened class_dev->name='%s'", class_dev->name);
 
@@ -165,8 +173,11 @@ int main(int argc, char *argv[], char *envp[])
                /* name, create node, store in db */
                retval = udev_add_device(&udev, class_dev);
 
-               /* run scripts */
-               dev_d_execute(&udev);
+               /* run dev.d/ scripts if we created a node or changed a netif name */
+               if (udev.devname[0] != '\0') {
+                       setenv("DEVNAME", udev.devname, 1);
+                       dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+               }
 
                sysfs_close_class_device(class_dev);
                break;
@@ -176,8 +187,11 @@ int main(int argc, char *argv[], char *envp[])
                /* get node from db, delete it*/
                retval = udev_remove_device(&udev);
 
-               /* run scripts */
-               dev_d_execute(&udev);
+               /* run dev.d/ scripts if we're not instructed to ignore the event */
+               if (udev.devname[0] != '\0') {
+                       setenv("DEVNAME", udev.devname, 1);
+                       dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+               }
        }
 
 exit: