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 + * 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 * 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 @@ -39,6 +39,10 @@ 2010-05-29 + + [matthew] - Upgrade to Udev-156. Fixes + #2671. + [matthew] - Upgrade to Pkg-config-0.25. Fixes #2670. 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: 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 +mknod -m0666 /lib/udev/devices/null c 1 3 Prepare the package for compilation: diff --git a/packages.ent b/packages.ent index 485f3b340..3243ae982 100644 --- a/packages.ent +++ b/packages.ent @@ -288,7 +288,7 @@ - + @@ -513,10 +513,10 @@ - - + + - +