[PATCH] don't call dev.d/ scripts twice, if directory = subsystem

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 9b0a00fb78c7c53d642fc17ed88ea345c782c0c8..5ad7e425e6fc212433148a52b16489aca28afc4d 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -180,7 +180,7 @@ 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);
                                udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                        }
@@ -198,7 +198,7 @@ int main(int argc, char *argv[], char *envp[])
                                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);
                                udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                        }