update SUSE rules

[elogind.git] / udevstart.c

diff --git a/udevstart.c b/udevstart.c
index 5f3ba711f0303deffaa1a5dc160ecdbd9d114597..23a13e08ff319f8950fa0318c7623e91234bcadc 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -315,10 +315,7 @@ static void udev_scan_class(void)
                                        snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
                                        dirname2[sizeof(dirname2)-1] = '\0';
 
-                                       /* pass the net class as it is */
-                                       if (strcmp(dent->d_name, "net") == 0)
-                                               device_list_insert(dirname2, "net", &device_list);
-                                       else if (has_devt(dirname2))
+                                       if (has_devt(dirname2) || strcmp(dent->d_name, "net") == 0)
                                                device_list_insert(dirname2, dent->d_name, &device_list);
                                }
                                closedir(dir2);
@@ -367,7 +364,7 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timeout to prevent hanging processes */
        alarm(UDEV_ALARM_TIMEOUT);
 
-       udev_rules_init(&rules, 1);
+       udev_rules_init(&rules, 0, 1);
 
        udev_scan_block();
        udev_scan_class();