fix uninitialized name_list error::ignore_error

[elogind.git] / udev / udevtrigger.c

diff --git a/udev/udevtrigger.c b/udev/udevtrigger.c
index d4b10d06ab461516ae62e7ae8566144bf1209b03..19a3dbb10e1979137567e356da1842fd51b7728e 100644 (file)
--- a/udev/udevtrigger.c
+++ b/udev/udevtrigger.c
@@ -392,6 +392,8 @@ static void scan_subsystem(const char *subsys, enum scan_type scan)
                        strlcat(dirname, dent->d_name, sizeof(dirname));
 
                        if (scan == SCAN_SUBSYSTEM) {
+                               if (attr_filtered(dirname))
+                                       continue;
                                if (!subsystem_filtered("subsystem"))
                                        device_list_insert(dirname);
                                if (subsystem_filtered("drivers"))
@@ -536,7 +538,7 @@ static void scan_failed(void)
        struct dirent *dent;
 
        strlcpy(base, udev_root, sizeof(base));
-       strlcat(base, "/" EVENT_FAILED_DIR, sizeof(base));
+       strlcat(base, "/.udev/failed", sizeof(base));
 
        dir = opendir(base);
        if (dir != NULL) {
@@ -582,7 +584,7 @@ int udevtrigger(int argc, char *argv[], char *envp[])
 
        logging_init("udevtrigger");
        udev_config_init();
-       dbg("version %s\n", UDEV_VERSION);
+       dbg("version %s\n", VERSION);
        sysfs_init();
 
        while (1) {