[PATCH] fix udevtest to print the error if logging is disabled

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index f0c38b3a51b5fd7481e0782bb42a283f304978d7..93387f76d0b9d8e462a7b1b8a50c3e966353a979 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -64,16 +64,16 @@ int main(int argc, char *argv[], char *envp[])
 
        info("version %s", UDEV_VERSION);
 
-       if (argc != 3) {
-               info("Usage: udevtest <devpath> <subsystem>");
-               return 1;
-       }
-
        /* initialize our configuration */
        udev_init_config();
        if (udev_log_priority < LOG_INFO)
                udev_log_priority = LOG_INFO;
 
+       if (argc != 3) {
+               info("Usage: udevtest <devpath> <subsystem>");
+               return 1;
+       }
+
        /* remove sysfs_path if given */
        if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
                devpath = &argv[1][strlen(sysfs_path)] ;
@@ -86,16 +86,17 @@ int main(int argc, char *argv[], char *envp[])
                } else
                        devpath = argv[1];
 
-       info("looking at '%s'", devpath);
+       subsystem = argv[2];
+       setenv("DEVPATH", devpath, 1);
+       setenv("SUBSYSTEM", subsystem, 1);
+       setenv("ACTION", "add", 1);
+       info("looking at device '%s' from subsystem '%s'", devpath, subsystem);
 
        /* initialize the naming deamon */
        udev_rules_init();
 
-       if (argc == 3)
-               subsystem = argv[2];
-
        /* fill in values and test_run flag*/
-       udev_init_device(&udev, devpath, subsystem);
+       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)) {