Author: alexander
Date: 2005-05-13 23:36:19 -0600 (Fri, 13 May 2005)
New Revision: 147
Modified:
trunk/TODO
trunk/initramfs/Makefile
trunk/initramfs/init
Log:
Load modules directly from the CD, not from unionfs which has issues with
F_SETLKW locking.
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2005-05-14 04:33:19 UTC (rev 146)
+++ trunk/TODO 2005-05-14 05:36:19 UTC (rev 147)
@@ -9,7 +9,6 @@
* Add some Greek TrueType fonts.
* Remove Bitstream Vera, adjust /etc/fonts/fonts.conf accordingly
* Ask someone how to use USB to serial converters. Add support to the kernel.
-* Find out why via-agp.ko doesn't load properly here (regression against pre2
livecd)
* Find out exact requirements for Intel framebuffer
* Reduce dhcpcd timeout. The boot process appears to hang when there is no
DHCP server in the network.
* Add raid-tools
Modified: trunk/initramfs/Makefile
===================================================================
--- trunk/initramfs/Makefile 2005-05-14 04:33:19 UTC (rev 146)
+++ trunk/initramfs/Makefile 2005-05-14 05:36:19 UTC (rev 147)
@@ -10,7 +10,7 @@
initramfs_data.cpio.gz: init
mkdir -p $(WD)/{dev,bin,lib,.tmpfs,.union}
- $(CP)
$(KLIBC)/bin/{insmod,isoinfo,losetup,mkdir,mount,run-init,sh,sleep} $(WD)/bin
+ $(CP)
$(KLIBC)/bin/{insmod,isoinfo,ln,losetup,mkdir,mount,run-init,sh,sleep} $(WD)/bin
$(CP) $(KLIBC)/lib/klibc-*.so $(WD)/lib
$(CP) /lib/modules/$(KVERS)/kernel/fs/unionfs.ko $(WD)/lib
$(CP) init $(WD)
Modified: trunk/initramfs/init
===================================================================
--- trunk/initramfs/init 2005-05-14 04:33:19 UTC (rev 146)
+++ trunk/initramfs/init 2005-05-14 05:36:19 UTC (rev 147)
@@ -27,15 +27,20 @@
mkdir /.tmpfs/.overlay
# Probably redundant, but might be useful in the future for ejecting the CD
-mkdir /.tmpfs/.overlay/dev
-mkdir /.tmpfs/.overlay/dev/shm
-mkdir /.tmpfs/.overlay/proc
+mkdir -p /.tmpfs/.overlay/dev/shm /.tmpfs/.overlay/proc
mkdir /.tmpfs/.cdrom
mkdir /.tmpfs/.sqfs
mount -r -t iso9660 $CDROM /.tmpfs/.cdrom
losetup /dev/loop0 /.tmpfs/.cdrom/root.sqfs
mount -r -t squashfs /dev/loop0 /.tmpfs/.sqfs
+
+# File locking doesn't work well on unionfs, this breaks module-init-tools
+MODDIR=`echo /.tmpfs/.sqfs/lib/modules/*`
+MODDIR=${MODDIR#/.tmpfs/.sqfs/}
+mkdir -p /.tmpfs/.overlay/$MODDIR
+ln -s /dev/shm/.sqfs/$MODDIR/kernel /.tmpfs/.overlay/$MODDIR
+
insmod /lib/unionfs.ko
mount -w -t unionfs -o
dirs=/.tmpfs/.overlay=rw:/.tmpfs/.cdrom=ro:/.tmpfs/.sqfs=ro unionfs /.union
mount -o move /.tmpfs /.union/dev/shm
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
