r9290 - in trunk/BOOK/bootscripts/contrib/lsb-v3: . init.d

dj at linuxfromscratch.org dj at linuxfromscratch.org
Fri May 28 19:39:29 PDT 2010


Author: dj
Date: 2010-05-28 20:39:28 -0600 (Fri, 28 May 2010)
New Revision: 9290

Modified:
   trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog
   trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev
   trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev_retry
Log:
Sync lsb-v3 scripts to LFS-Bootscripts-20100529 (udev changes).

Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog	2010-05-28 17:50:36 UTC (rev 9289)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog	2010-05-29 02:39:28 UTC (rev 9290)
@@ -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.

Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev	2010-05-28 17:50:36 UTC (rev 9289)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev	2010-05-29 02:39:28 UTC (rev 9290)
@@ -37,7 +37,9 @@
 		# 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 @@
 
 		# 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

Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev_retry
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev_retry	2010-05-28 17:50:36 UTC (rev 9289)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev_retry	2010-05-29 02:39:28 UTC (rev 9290)
@@ -33,7 +33,7 @@
                 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




More information about the lfs-book mailing list