From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 29 Dec 2008 05:04:09 +0000 (+0100)
Subject: require non-SYSFS_DEPRECATED 2.6.20+ kernel
X-Git-Tag: 174~1235
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=64be143742a487e826068e906d1bfb180acdb0ae

require non-SYSFS_DEPRECATED 2.6.20+ kernel
---

diff --git a/README b/README
index a76583aba..0add462f3 100644
--- a/README
+++ b/README
@@ -9,13 +9,12 @@ Important Note:
   recommend to replace a distro's udev installation with the upstream version.
 
 Requirements:
-  - Version 2.6.19 of the Linux kernel for reliable operation of this release of
-    udev. The kernel may have a requirement on udev too, see Documentation/Changes
-    in the kernel source tree for the actual dependency.
+  - Version 2.6.20 of the Linux kernel for reliable operation of this release of
+    udev. The kernel must not use the CONFIG_SYSFS_DEPRECATED* option.
 
   - The kernel must have sysfs, unix domain sockets and networking enabled.
-    (unix domain sockets (CONFIG_UNIX) as a loadable kernel module may work,
-    but it does not make any sense - don't complain if anything goes wrong.)
+    Unix domain sockets (CONFIG_UNIX) as a loadable kernel module is not
+    supported.
 
   - The proc filesystem must be mounted on /proc/, the sysfs filesystem must
     be mounted at /sys/. No other locations are supported by udev.
diff --git a/udev/udevd.c b/udev/udevd.c
index bfd732319..993964d23 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -823,9 +823,10 @@ int main(int argc, char *argv[])
 		util_strlcat(path, "/class/mem/null", sizeof(path));
 		if (lstat(path, &statbuf) == 0) {
 			if (S_ISDIR(statbuf.st_mode)) {
-				const char *depr_str = "<6>udev: deprecated sysfs layout (kernel too old, "
-							"or CONFIG_SYSFS_DEPRECATED) is unsupported, some "
-							"udev features may fail\n";
+				const char *depr_str =
+					"<6>udev: deprecated sysfs layout; update the kernel or "
+					"disable CONFIG_SYSFS_DEPRECATED; some udev features will "
+					"not work correctly\n";
 
 				write(fd, depr_str, strlen(depr_str));
 			}