fixups to get back to proper patch order

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 9b0a00fb78c7c53d642fc17ed88ea345c782c0c8..35fa533a4e76d6f49747cd9c12b7dd9d7ef596af 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -108,7 +108,6 @@ int main(int argc, char *argv[], char *envp[])
        udev_init_config();
 
        /* set signal handlers */
-       memset(&act, 0x00, sizeof(act));
        act.sa_handler = (void (*) (int))sig_handler;
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
@@ -180,7 +179,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);
                        }
@@ -193,12 +192,8 @@ 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);
                                udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                        }