[PATCH] support DRIVER as a rule key

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 300e85ceb0aa0737c74f589cc39de53e43ed6f41..a41f22277880be604ab4beef193847373110bbd0 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
@@ -165,8 +164,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;
@@ -177,7 +179,7 @@ int main(int argc, char *argv[], char *envp[])
                retval = udev_remove_device(&udev);
 
                /* run scripts */
-               dev_d_execute(&udev);
+               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
        }
 
 exit: