Author: alexander
Date: 2007-09-26 08:04:26 -0600 (Wed, 26 Sep 2007)
New Revision: 2079
Modified:
trunk/packages/initramfs/init.in
trunk/packages/lfs-bootscripts/lfs-bootscripts-livecd-1.patch
Log:
Made it possible to load modules that exist on the main CD filesystem with the
load=... boot parameter.
Earlier, it worked only for modules that existed in the initramfs.
Modified: trunk/packages/initramfs/init.in
===================================================================
--- trunk/packages/initramfs/init.in 2007-09-26 12:52:49 UTC (rev 2078)
+++ trunk/packages/initramfs/init.in 2007-09-26 14:04:26 UTC (rev 2079)
@@ -423,7 +423,9 @@
udevd --daemon
( IFS="," ; for module in $load ; do
- modprobe "$module"
+ # Some modules exist only on the main CD filesystem.
+ # Suppress the error about them not being found.
+ modprobe -q "$module"
done )
udevtrigger
Modified: trunk/packages/lfs-bootscripts/lfs-bootscripts-livecd-1.patch
===================================================================
--- trunk/packages/lfs-bootscripts/lfs-bootscripts-livecd-1.patch
2007-09-26 12:52:49 UTC (rev 2078)
+++ trunk/packages/lfs-bootscripts/lfs-bootscripts-livecd-1.patch
2007-09-26 14:04:26 UTC (rev 2079)
@@ -66,7 +66,7 @@
diff -urN lfs-bootscripts-20060712.orig/Makefile
lfs-bootscripts-20060712/Makefile
--- lfs-bootscripts-20060712.orig/Makefile 2006-06-03 08:23:11.000000000
+0600
+++ lfs-bootscripts-20060712/Makefile 2006-07-14 21:47:48.000000000 +0600
-@@ -86,6 +86,44 @@
+@@ -86,6 +86,46 @@
install -m ${MODE}
lfs/sysconfig/network-devices/services/ipv4-static
${EXTDIR}/sysconfig/network-devices/services/
install -m ${MODE}
lfs/sysconfig/network-devices/services/ipv4-static-route
${EXTDIR}/sysconfig/network-devices/services/
@@ -74,6 +74,7 @@
+ install -m ${CONFMODE} lfs/init.d/functions ${EXTDIR}/rc.d/init.d/
+ install -m ${MODE} lfs/init.d/console ${EXTDIR}/rc.d/init.d/
+ install -m ${MODE} lfs/init.d/localnet ${EXTDIR}/rc.d/init.d/
++ install -m ${MODE} lfs/init.d/modules ${EXTDIR}/rc.d/init.d/
+ install -m ${MODE} lfs/init.d/mountfs ${EXTDIR}/rc.d/init.d/
+ install -m ${MODE} lfs/init.d/mountkernfs ${EXTDIR}/rc.d/init.d/
+ install -m ${MODE} lfs/init.d/network ${EXTDIR}/rc.d/init.d/
@@ -97,6 +98,7 @@
+ # ln -sf ../init.d/network ${EXTDIR}/rc.d/rc5.d/S20network
+ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc6.d/K80network
+ ln -sf ../init.d/mountkernfs ${EXTDIR}/rc.d/rcsysinit.d/S00mountkernfs
++ ln -sf ../init.d/modules ${EXTDIR}/rc.d/rcsysinit.d/S05modules
+ ln -sf ../init.d/udev ${EXTDIR}/rc.d/rcsysinit.d/S10udev
+ ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
+ ln -sf ../init.d/setclock ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
