From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sat, 18 Jun 2011 20:50:55 +0000 (+0200)
Subject: libudev: enumerate - scan /sys/module
X-Git-Tag: 174~91
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=325293609392d0feba7a31ca9ed0940c8509c2ea

libudev: enumerate - scan /sys/module
---

diff --git a/Makefile.am b/Makefile.am
index 3ea96df90..0ca351c82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ dist_libexec_SCRIPTS =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=11
-LIBUDEV_REVISION=5
+LIBUDEV_REVISION=6
 LIBUDEV_AGE=11
 
 SUBDIRS += libudev/docs
diff --git a/libudev/libudev-enumerate.c b/libudev/libudev-enumerate.c
index 6e51726f0..0b028bab8 100644
--- a/libudev/libudev-enumerate.c
+++ b/libudev/libudev-enumerate.c
@@ -814,15 +814,25 @@ UDEV_EXPORT int udev_enumerate_scan_subsystems(struct udev_enumerate *udev_enume
 	if (udev_enumerate == NULL)
 		return -EINVAL;
 
+	/* all kernel modules */
+	if (match_subsystem(udev_enumerate, "module")) {
+		dbg(udev, "searching '%s/modules/*' dir\n", subsysdir);
+		scan_dir_and_add_devices(udev_enumerate, "module", NULL, NULL);
+	}
+
 	util_strscpyl(base, sizeof(base), udev_get_sys_path(udev), "/subsystem", NULL);
 	if (stat(base, &statbuf) == 0)
 		subsysdir = "subsystem";
 	else
 		subsysdir = "bus";
+
+	/* all subsystems (only buses support coldplug) */
 	if (match_subsystem(udev_enumerate, "subsystem")) {
 		dbg(udev, "searching '%s/*' dir\n", subsysdir);
 		scan_dir_and_add_devices(udev_enumerate, subsysdir, NULL, NULL);
 	}
+
+	/* all subsystem drivers */
 	if (match_subsystem(udev_enumerate, "drivers")) {
 		dbg(udev, "searching '%s/*/drivers/*' dir\n", subsysdir);
 		scan_dir(udev_enumerate, subsysdir, "drivers", "drivers");