diff options
| -rw-r--r-- | bootscripts/contrib/lsb-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | bootscripts/contrib/lsb-v3/init.d/udev | 6 | ||||
| -rw-r--r-- | bootscripts/contrib/lsb-v3/init.d/udev_retry | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/bootscripts/contrib/lsb-v3/ChangeLog b/bootscripts/contrib/lsb-v3/ChangeLog index 6e4e91f7e..f599bc2d8 100644 --- a/bootscripts/contrib/lsb-v3/ChangeLog +++ b/bootscripts/contrib/lsb-v3/ChangeLog @@ -1,4 +1,8 @@ ChangeLog +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. + 20100427 - [dj] * Removed unneeded X-LFS-Default* lines. * Corrected udev_retry script for new udev. * Corrected path of syslogd and klogd in sysklogd script. diff --git a/bootscripts/contrib/lsb-v3/init.d/udev b/bootscripts/contrib/lsb-v3/init.d/udev index fa3e71006..5e74561ca 100644 --- a/bootscripts/contrib/lsb-v3/init.d/udev +++ b/bootscripts/contrib/lsb-v3/init.d/udev @@ -37,7 +37,9 @@ case "${1}" in # made or removed during this boot don't affect the next one. # The reason we don't write to mtab is because we don't ever # want /dev to be unavailable (such as by `umount -a'). - mount -n -t tmpfs tmpfs /dev -o mode=755 + if ! mountpoint /dev > /dev/null; then + mount -n -t tmpfs tmpfs /dev -o mode=755 + fi if [ ${?} != 0 ]; then echo_failure boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE} @@ -63,7 +65,7 @@ case "${1}" in # Now traverse /sys in order to "coldplug" devices that have # already been discovered - /sbin/udevadm trigger + /sbin/udevadm trigger --action=add # Now wait for udevd to process the uevents we triggered /sbin/udevadm settle diff --git a/bootscripts/contrib/lsb-v3/init.d/udev_retry b/bootscripts/contrib/lsb-v3/init.d/udev_retry index 53df4d5c1..24b956ae0 100644 --- a/bootscripts/contrib/lsb-v3/init.d/udev_retry +++ b/bootscripts/contrib/lsb-v3/init.d/udev_retry @@ -33,7 +33,7 @@ case "${1}" in done # Re-trigger the failed uevents in hope they will succeed now - /sbin/udevadm trigger --type=failed + /sbin/udevadm trigger --type=failed --action=add # Now wait for udevd to process the uevents we triggered /sbin/udevadm settle |