r589 - in x86/trunk: initramfs linux

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Thu Aug 25 13:24:58 PDT 2005


Author: jhuntwork
Date: 2005-08-25 14:24:57 -0600 (Thu, 25 Aug 2005)
New Revision: 589

Modified:
   x86/trunk/initramfs/Makefile
   x86/trunk/initramfs/init
   x86/trunk/linux/config
Log:
Fixed issue with kernel not finding the correct drive. This was due to the changing of the CD label to be dynamic.

Modified: x86/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile	2005-08-25 14:16:18 UTC (rev 588)
+++ x86/trunk/initramfs/Makefile	2005-08-25 20:24:57 UTC (rev 589)
@@ -30,7 +30,8 @@
 	@$(CP) $(KLIBC)/bin/{insmod,isoinfo,ln,losetup,mkdir,mount,run-init,sh,sleep} $(WDIR)/bin
 	@$(CP) $(KLIBC)/lib/klibc-*.so $(WDIR)/lib
 	@$(CP) /lib/modules/$(KVERS)/kernel/fs/unionfs.ko $(WDIR)/lib
-	@$(CP) init $(WDIR)
+	@sed 's/-VERSION/-$(VERSION)/' init > init.new
+	@$(CP) init.new $(WDIR)/init
 	@$(MK) -m 640 $(WDIR)/dev/console c 5 1
 	@$(MK) -m 660 $(WDIR)/dev/hda b 3 0
 	@$(MK) -m 660 $(WDIR)/dev/hdb b 3 64

Modified: x86/trunk/initramfs/init
===================================================================
--- x86/trunk/initramfs/init	2005-08-25 14:16:18 UTC (rev 588)
+++ x86/trunk/initramfs/init	2005-08-25 20:24:57 UTC (rev 589)
@@ -1,5 +1,9 @@
 #!/bin/sh
-LABEL="LFS_CD"
+
+# The LABEL value below must match the label given when creating the iso.
+# This is done automatically in the make scripts using a simple sed.
+# See the packages/initramfs/Makefile for the actual command.
+LABEL="lfslivecd-VERSION"
 DEVS=`echo /dev/hd* /dev/sr*`
 
 while [ -z "$CDROM" ] && [ "$TIMEOUT" != "..............." ] ; do

Modified: x86/trunk/linux/config
===================================================================
--- x86/trunk/linux/config	2005-08-25 14:16:18 UTC (rev 588)
+++ x86/trunk/linux/config	2005-08-25 20:24:57 UTC (rev 589)
@@ -36,11 +36,11 @@
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
 # CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_BASE_FULL=y
+# CONFIG_PRINTK is not set
+# CONFIG_BUG is not set
+# CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
@@ -49,7 +49,7 @@
 CONFIG_CC_ALIGN_LOOPS=0
 CONFIG_CC_ALIGN_JUMPS=0
 # CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
+# CONFIG_BASE_SMALL is not set
 
 #
 # Loadable module support




More information about the livecd mailing list