bleah, more merge fixes...

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 0ee70529c4edb923b053c104570a9a1a1623532c..cf66e7cc89d9fed2a903a9d4f7556e3a301700fe 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -118,6 +118,7 @@ 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;
@@ -209,9 +210,10 @@ int main(int argc, char *argv[], char *envp[])
                }
 
                /* run dev.d/ scripts if we created/deleted a node or changed a netif name */
-               if (udev_dev_d && udev.devname[0] != '\0') {
+               if (udev.devname[0] != '\0') {
                        setenv("DEVNAME", udev.devname, 1);
-                       udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+                       if (udev_dev_d)
+                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                }
        } else if ((strncmp(devpath, "/devices/", 9) == 0)) {
                if (strcmp(action, "add") == 0) {