Changeset 3179cd6

Timestamp:

05/29/2010 02:39:28 AM (14 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

217a91b

Parents:

b21778b

Message:

Sync lsb-v3 scripts to LFS-Bootscripts-20100529 (udev changes).

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

Location:

bootscripts/contrib/lsb-v3

Files:

• ChangeLog (modified) (1 diff)
• init.d/udev (modified) (2 diffs)
• init.d/udev_retry (modified) (1 diff)

bootscripts/contrib/lsb-v3/ChangeLog

@@ -1 +1 @@
 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.

bootscripts/contrib/lsb-v3/init.d/udev

@@ -38 +38 @@
                 # 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
@@ -64 +66 @@
                 # 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

bootscripts/contrib/lsb-v3/init.d/udev_retry

@@ -34 +34 @@
 
                 # 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