require non-SYSFS_DEPRECATED 2.6.20+ kernel

diff --git a/README b/README
index a76583ababfed3434e961a9c8a125b5c1e9e9033..0add462f31e604bfb65807721ba808874c288ef0 100644 (file)
--- 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 bfd732319d36862c4d5a371ce10093d1ab362188..993964d23d39f2fb1485dc8c8725af7e4202df86 100644 (file)
--- 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));
                        }