X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=4e02ac7dbc2b4f351947c1793a31d68ba405a11e;hp=9cc23f0ac70be903fb54edd9e4215d004c3e8870;hb=8f2f6e426fc4cc1fa39b864a1792428a4269b751;hpb=a0294b76252d8c84656218cafd458e6739361247

diff --git a/udevtest.c b/udevtest.c
index 9cc23f0ac..4e02ac7db 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -29,6 +29,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_sysfs.h"
 #include "udev_utils.h"
 #include "udev_version.h"
 #include "namedev.h"
@@ -36,7 +37,6 @@
 
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
 	va_list args;
@@ -84,12 +84,6 @@ int main(int argc, char *argv[], char *envp[])
 
 	info("looking at '%s'", devpath);
 
-	/* we only care about class devices and block stuff */
-	if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
-		dbg("not a block or class device");
-		return 2;
-	}
-
 	/* initialize the naming deamon */
 	namedev_init();
 
@@ -97,7 +91,13 @@ int main(int argc, char *argv[], char *envp[])
 		subsystem = argv[2];
 
 	/* fill in values and test_run flag*/
-	udev_set_values(&udev, devpath, subsystem, "add");
+	udev_init_device(&udev, devpath, subsystem);
+
+	/* skip subsystems without "dev", but handle net devices */
+	if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) {
+		info("don't care about '%s' devices", udev.subsystem);
+		return 2;
+	}
 
 	/* open the device */
 	snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
@@ -107,7 +107,7 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
-	dbg("opened class_dev->name='%s'", class_dev->name);
+	info("opened class_dev->name='%s'", class_dev->name);
 
 	/* simulate node creation with test flag */
 	udev.test_run = 1;