Upgrade to Udev-156. Fixes #2671.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9294 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 26 insertions, 14 deletions

diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index aaff70c15..bf7aec7a5 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-29	Matt Burgess <matthew@linuxfromscratch.org>
+   * lfs/init.d/udev: Only copy /lib/udev/devices/null, as Udev >= 155 copies
+     devices from /lib/udev/devices to /dev itself.  Udevd still needs /dev/null
+     present before starting up though.
+
 2010-04-20	Bryan Kadzban <bryan@linuxfromscratch.org>
    * lfs/init.d/udev, lfs/init.d/udev_retry: Add --action=add, to handle udev
    version 152 and newer, which send "change" events by default in udevtrigger
diff --git a/bootscripts/contrib/lsb-v3/ChangeLog b/bootscripts/contrib/lsb-v3/ChangeLog
index f599bc2d8..f5620de28 100644
--- a/bootscripts/contrib/lsb-v3/ChangeLog
+++ b/bootscripts/contrib/lsb-v3/ChangeLog
@@ -1,4 +1,10 @@
 ChangeLog
+
+20100529 - [matthew]
+                * Only copy /lib/udev/devices/null, as Udev >= 155 copies
+                  devices from /lib/udev/devices to /dev itself.
+                  Udevd still needs /dev/null present before starting up though.
+
 20100529 - [dj] * Sync to LFS-Bootscirpts-20100529
                 * Add test if /dev is already mounted in udev script.
                 * Added --action=add to udevadmin trigger lines of udev script.
diff --git a/bootscripts/contrib/lsb-v3/init.d/udev b/bootscripts/contrib/lsb-v3/init.d/udev
index 5e74561ca..c019ab879 100644
--- a/bootscripts/contrib/lsb-v3/init.d/udev
+++ b/bootscripts/contrib/lsb-v3/init.d/udev
@@ -56,8 +56,9 @@ case "${1}" in
 		# the kernel call out to any binary in response to them
 		echo > /proc/sys/kernel/hotplug
 
-		# Copy static device nodes to /dev
-		cp -a /lib/udev/devices/* /dev
+		# Copy the only static device node that Udev >= 155 doesn't
+		# handle to /dev
+		cp -a /lib/udev/devices/null /dev
 
 		# Start the udev daemon to continually watch for, and act on,
 		# uevents
diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev
index ff4fe2a7a..570d0e699 100644
--- a/bootscripts/lfs/init.d/udev
+++ b/bootscripts/lfs/init.d/udev
@@ -53,8 +53,9 @@ case "${1}" in
 		# the kernel call out to any binary in response to them
 		echo > /proc/sys/kernel/hotplug
 
-		# Copy static device nodes to /dev
-		cp -a /lib/udev/devices/* /dev
+		# Copy the only static device node that Udev >= 155 doesn't
+		# handle to /dev
+		cp -a /lib/udev/devices/null /dev
 
 		# Start the udev daemon to continually watch for, and act on,
 		# uevents
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b1af074b8..af5975add 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
       <para>2010-05-29</para>
       <itemizedlist>
          <listitem>
+           <para>[matthew] - Upgrade to Udev-156.  Fixes
+           <ulink url="&lfs-ticket-root;2671">#2671</ulink>.</para>
+         </listitem>
+         <listitem>
            <para>[matthew] - Upgrade to Pkg-config-0.25.  Fixes
            <ulink url="&lfs-ticket-root;2670">#2670</ulink>.</para>
          </listitem>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 4f2af494a..4764603d8 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -50,12 +50,7 @@
     them being required very early in the boot process, or by Udev itself:</para>
 
 <screen><userinput remap="install">install -dv /lib/{firmware,udev/devices/{pts,shm}}
-mknod -m0666 /lib/udev/devices/null c 1 3
-ln -sv /proc/self/fd /lib/udev/devices/fd
-ln -sv /proc/self/fd/0 /lib/udev/devices/stdin
-ln -sv /proc/self/fd/1 /lib/udev/devices/stdout
-ln -sv /proc/self/fd/2 /lib/udev/devices/stderr
-ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
+mknod -m0666 /lib/udev/devices/null c 1 3</userinput></screen>
 
     <para>Prepare the package for compilation:</para>
 
diff --git a/packages.ent b/packages.ent
index 485f3b340..3243ae982 100644
--- a/packages.ent
+++ b/packages.ent
@@ -288,7 +288,7 @@
 <!ENTITY less-ch6-du "2.9 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20100124">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20100529">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -513,10 +513,10 @@
 <!ENTITY texinfo-ch6-du "21 MB">
 <!ENTITY texinfo-ch6-sbu "0.3 SBU">
 
-<!ENTITY udev-version "154">
-<!ENTITY udev-size "520 KB">
+<!ENTITY udev-version "156">
+<!ENTITY udev-size "521 KB">
 <!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "28064e0325050a1eedec4c142da65ea7">
+<!ENTITY udev-md5 "5efef35990dd20d8bb459eaff36d1f88">
 <!ENTITY udev-home "&kernel;linux/utils/kernel/hotplug/udev.html">
 <!ENTITY udev-ch6-du "11.6 MB">
 <!ENTITY udev-ch6-sbu "0.2 SBU">