From d27d3bb05288fb5e70bc3f3fc7da1dc8ee5413a8 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 22 Jun 2005 01:31:24 +0200 Subject: fix udevstart and let all events trvel trough udev Signed-off-by: Kay Sievers --- udev.c | 14 +++++++------- udevtest.c | 17 ++++++++--------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/udev.c b/udev.c index f7b9bf3573..67d081d005 100644 --- 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 93387f76d0..d3e43593bf 100644 --- 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; -- cgit v1.2.3-54-g00ecf