fix udevstart and let all events trvel trough udev

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/udev.c b/udev.c
index f7b9bf3573e0e66a71b6e44fe9fc9689a75a8439..67d081d00560c375684b4be202598e70afe5268a 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -200,13 +200,13 @@ int main(int argc, char *argv[], char *envp[])
                                info("device event will be ignored");
                                goto cleanup;
                        }
-               } else if (strcmp(action, "remove") == 0) {
-                       dbg("devices remove");
-                       udev_rules_get_run(&udev, NULL);
-                       if (udev.ignore_device) {
-                               info("device event will be ignored");
-                               goto cleanup;
-                       }
+               }
+       } else {
+               dbg("default handling");
+               udev_rules_get_run(&udev, NULL);
+               if (udev.ignore_device) {
+                       info("device event will be ignored");
+                       goto cleanup;
                }
        }
 

diff --git a/udevtest.c b/udevtest.c
index 93387f76d0b9d8e462a7b1b8a50c3e966353a979..d3e43593bf810078da7f2cc062c0ce5775ef5aa5 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -98,12 +98,6 @@ int main(int argc, char *argv[], char *envp[])
        /* fill in values and test_run flag*/
        udev_init_device(&udev, devpath, subsystem, "add");
 
-       /* skip subsystems without "dev", but handle net devices */
-       if (udev.type != DEV_NET && subsystem_expect_no_dev(udev.subsystem)) {
-               info("don't care about '%s' devices", udev.subsystem);
-               return 2;
-       }
-
        /* open the device */
        snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
        path[sizeof(path)-1] = '\0';
@@ -112,13 +106,18 @@ int main(int argc, char *argv[], char *envp[])
                info("sysfs_open_class_device_path failed");
                return 1;
        }
-
        info("opened class_dev->name='%s'", class_dev->name);
 
+       if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS)
+               udev.devt = get_devt(class_dev);
+
        /* simulate node creation with test flag */
        udev.test_run = 1;
-       udev_add_device(&udev, class_dev);
-
+       if (udev.type == DEV_NET || udev.devt) {
+               udev_rules_get_name(&udev, class_dev);
+               udev_add_device(&udev, class_dev);
+       } else
+               info("only char and block devices with a dev-file are supported by this test program");
        sysfs_close_class_device(class_dev);
 
        return 0;