r1900 - trunk/packages/initramfs

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sat Jun 2 23:53:43 PDT 2007


Author: alexander
Date: 2007-06-03 00:53:43 -0600 (Sun, 03 Jun 2007)
New Revision: 1900

Modified:
   trunk/packages/initramfs/Makefile
   trunk/packages/initramfs/init.in
Log:
Removed race condition when starting and stopping udev in initramfs.
Removed too-zealous blacklising of ata-piix.


Modified: trunk/packages/initramfs/Makefile
===================================================================
--- trunk/packages/initramfs/Makefile	2007-05-30 11:18:01 UTC (rev 1899)
+++ trunk/packages/initramfs/Makefile	2007-06-03 06:53:43 UTC (rev 1900)
@@ -28,7 +28,7 @@
 	cp fakecd.iso.head $(WDIR)
 	mknod -m 640 $(WDIR)/dev/console c 5 1
 	mknod -m 664 $(WDIR)/dev/null c 1 3
-	cp /bin/{sh,dd,cat,cp,mkdir,mount,umount,sed,sleep,ln,rm,uname} $(WDIR)/bin
+	cp /bin/{sh,dd,cat,cp,killall,mkdir,mount,umount,sed,sleep,ln,rm,uname} $(WDIR)/bin
 	cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,ld-linux.so.2} $(WDIR)/lib
 	cp /lib/{libncursesw.so.5,libreadline.so.5,libhistory.so.5} $(WDIR)/lib
 	cp /lib/{libpthread.so.0,librt.so.1,libuuid.so.1} $(WDIR)/lib

Modified: trunk/packages/initramfs/init.in
===================================================================
--- trunk/packages/initramfs/init.in	2007-05-30 11:18:01 UTC (rev 1899)
+++ trunk/packages/initramfs/init.in	2007-06-03 06:53:43 UTC (rev 1900)
@@ -193,7 +193,7 @@
 			drv=${drv%.ko}
 			echo "blacklist $drv" >>/etc/modprobe.conf
 		done
-		echo "blacklist ata_piix" >>/etc/modprobe.conf
+		echo "install ata_piix /sbin/modprobe piix ; /sbin/modprobe -i ata_piix" >>/etc/modprobe.conf
 		echo "blacklist ata_generic" >>/etc/modprobe.conf
 		;;
 	1)
@@ -211,8 +211,7 @@
 	echo "options ata-generic all_generic_ide=1" >>/etc/modprobe.conf
 fi
 
-/sbin/udevd &
-PIDOF_UDEVD=$!
+/sbin/udevd --daemon
 
 ( IFS="," ; for module in $load ; do
 	/sbin/modprobe "$module"
@@ -225,7 +224,7 @@
 do_resume
 do_mount_root
 
-kill $PIDOF_UDEVD
+killall -w /sbin/udevd
 
 umount /sys
 umount /proc




More information about the livecd mailing list