r640 - in x86/trunk: . initramfs

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Fri Sep 16 20:31:30 PDT 2005


Author: jhuntwork
Date: 2005-09-16 21:31:30 -0600 (Fri, 16 Sep 2005)
New Revision: 640

Added:
   x86/trunk/LICENSE
   x86/trunk/initramfs/init.c
   x86/trunk/initramfs/init.h
   x86/trunk/initramfs/iso9660.h
Removed:
   x86/trunk/initramfs/init.orig
Modified:
   x86/trunk/initramfs/Makefile
Log:
Swapped out current init for a C-based init (helps support multiple archs) and added a copy of the GPL, version 2

Added: x86/trunk/LICENSE
===================================================================
--- x86/trunk/LICENSE	2005-09-09 23:43:47 UTC (rev 639)
+++ x86/trunk/LICENSE	2005-09-17 03:31:30 UTC (rev 640)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+

+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+

+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+

+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+

+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+

+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Modified: x86/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile	2005-09-09 23:43:47 UTC (rev 639)
+++ x86/trunk/initramfs/Makefile	2005-09-17 03:31:30 UTC (rev 640)
@@ -7,12 +7,11 @@
 MK= mknod
 CP= cp
 WDIR= temp
-KLIBC= /usr/lib/klibc
 
 # Targets
 # =============================================================================
 
-include $(ROOT)/scripts/functions
+#include $(ROOT)/scripts/functions
 
 chroot:
 	@chroot "$(MP)" $(chenv-blfs) \
@@ -21,17 +20,12 @@
 stage2: Makefile
 	@make compile-$@
 
-compile-stage2:
+compile-stage2: init
 	@$(call echo_message, Building)
 #==============================================================================
 # Building commands below \/
 #==============================================================================
-	@mkdir -p $(WDIR)/{dev,bin,lib,.tmpfs,.union}
-	@$(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.orig init
-	@sed -i 's/-VERSION/-$(VERSION)/' init
+	@mkdir -p $(WDIR)/{dev,bin,.tmpfs,.union}
 	@$(CP) init $(WDIR)/
 	@$(MK) -m 640 $(WDIR)/dev/console c 5 1
 	@$(MK) -m 660 $(WDIR)/dev/hda b 3 0
@@ -53,15 +47,24 @@
 	@$(MK) -m 660 $(WDIR)/dev/sr7 b 11 7
 	@$(MK) -m 660 $(WDIR)/dev/loop0 b 7 0
 	@cd $(WDIR); find . | cpio -o -H newc | gzip -9 > ../initramfs_data.cpio.gz
-	@$(CP) initramfs_data.cpio.gz /boot/isolinux
+ifeq ($(ARCH),x86)
+	@$(CP) initramfs_data.cpio.gz /boot/isolinux/initramfs_data_cpio.gz
+else
+	@$(CP) initramfs_data.cpio.gz /boot/
+endif
 	@rm -rf temp
 #
 #==Status Messages==========================================
 #
 	@$(OK)
 
+init:
+	sed -i '/VOLUME_ID/s@".*"@"$(VERSION)"@' init.h
+	gcc $@.c -o $@ -static -Os -s -Wall
+
 clean:
 	@-rm -rf temp
 	@-rm -f initramfs_data*
+	@-rm -f init
 
 .PHONY: clean chroot compile-stage2

Added: x86/trunk/initramfs/init.c
===================================================================
--- x86/trunk/initramfs/init.c	2005-09-09 23:43:47 UTC (rev 639)
+++ x86/trunk/initramfs/init.c	2005-09-17 03:31:30 UTC (rev 640)
@@ -0,0 +1,250 @@
+/*
+   Init for the Official LFS LiveCD
+   Written by Jeremy Huntwork, 2005-09-16
+
+   This code sets up a directory structure for the CD in the initramfs,
+   finds and mounts the LFS LiveCD, mounts the root file system via the
+   squashfs file, overlays it all with unionfs and finally passes
+   control over to sysvinit to finish the boot process.
+*/
+
+#include "init.h"
+
+
+/* Devices to check for the LFS CD, could scan some stuff in /proc in a later version */
+const char *devices[] = 
+{
+	"/dev/hda", "/dev/hdb", "/dev/hdc", "/dev/hdd", "/dev/hde", "/dev/hdf", "/dev/hdg", "/dev/hdh",
+	"/dev/sr0", "/dev/sr1", "/dev/sr2", "/dev/sr3", "/dev/sr4", "/dev/sr5", "/dev/sr6", "/dev/sr7",
+	NULL,
+};
+
+char *init_envp[10] = { "HOME=/", "TERM=linux", NULL, };
+char *init_argv[10] = { "init", NULL, };
+
+const char *lfscd;
+
+int mountlfscd(void);
+
+int main(void)
+{
+	int i, fd, ffd;
+	struct loop_info loopinfo;
+	
+	umask(0);
+	
+	printf("Initramfs activated\n");
+
+	printf("Mounting tmpfs...\n");
+	i = mount("tmpfs", TMPFS, "tmpfs", 0, "size=90%"); /* Mount a tmpfs */
+	if (i<0) {
+		printf("Failed to mount tmpfs: %s\n", strerror(errno));
+		return (0);
+	}
+	mkdir(OVERLAY, 0755);			     /* Create a .overlay directory */
+	mkdir(DEV, 0755);			     /* Create a /dev directory */
+	mkdir(SHM, 0755);			     /* Create a /dev/shm directory */
+	mkdir(PROC, 0755);			     /* Create a /proc directory */
+	mkdir(TMP, 1777);			     /* Create a /tmp directory */
+	mkdir(CDROM_MOUNT, 0755);		     /* Create a .cdrom directory */
+	mkdir(SQFS, 0755);			     /* Create a .sqfs directory */
+	mkdir("/.tmpfs/.tmp",1777);		     /* Create a .tmp directory */
+
+	for (i=0;i<MAX_RETRIES;i++)
+	{
+		if (mountlfscd())
+			break;
+
+		/* Failed to find any device with an lfs boot cd in :( */
+		printf("I couldn't find an LFS LiveCD in any drive!!\n");
+		printf("I'm going to wait 10 seconds and try again (Try %d/%d)\n", i, MAX_RETRIES);
+		sleep(10);
+	}
+
+	if (i>=MAX_RETRIES)
+	{
+		printf("I couldn't find an LFS LiveCD in any drive after %d retries!\n", MAX_RETRIES);
+		reboot(RB_POWER_OFF);
+		return(0);
+	}
+
+	/* If we're here, we have an LFS CD mounted and verified
+	
+	Attempt to attach the squashfs root file to /dev/loop0 */
+
+	printf("Setting up the loopback device...\n");
+
+	ffd = open(SQFS_FILE, O_RDONLY);
+	if (ffd<0) {
+		printf("Failed to open the squashfs file: %s\n", strerror(errno));
+		return(0);
+	}
+	
+	fd = open(LOOP, O_RDONLY);
+	if (fd<0) {
+		printf("Failed to open the loop device: %s\n", strerror(errno));
+		return(0);
+	}
+
+	memset(&loopinfo, 0, sizeof(loopinfo));
+	snprintf(loopinfo.lo_name, LO_NAME_SIZE, "%s", SQFS_FILE);
+
+	loopinfo.lo_offset = 0;
+	loopinfo.lo_encrypt_key_size = 0;
+	loopinfo.lo_encrypt_type = LO_CRYPT_NONE;
+
+	if(ioctl(fd, LOOP_SET_FD, ffd) < 0) {
+		printf("Failed to set up device: %s\n", strerror(errno));
+		return(0);
+	}
+	close(ffd);
+
+        if(ioctl(fd, LOOP_SET_STATUS, &loopinfo) < 0) {
+                printf("Failed to set up device: %s\n", strerror(errno));
+		(void) ioctl(fd, LOOP_CLR_FD, 0);
+		close(fd);
+                return(0);
+        }
+        close(fd);
+
+	/* Mount the squashfs root file system */
+
+	printf("Mounting squashfs file...\n");
+	i = mount(LOOP, SQFS, "squashfs", MS_RDONLY, NULL);
+	if (i<0) {
+		printf("Failed to mount squashfs: %s\n", strerror(errno));
+		return(0);
+	}
+
+	/* Activate unionfs */
+
+	printf("Mounting unionfs...\n");
+	i = mount("unionfs", "/.union", "unionfs", 0, "dirs=/.tmpfs/.overlay=rw:/.tmpfs/.cdrom=ro:/.tmpfs/.sqfs=ro");
+	if (i<0) {
+		printf("Failed to mount unionfs: %s\n", strerror(errno));
+		return(0);
+	}
+
+	/* Move the tmpfs to /dev/shm in the unionfs */
+
+	mount(TMPFS, "/.union/dev/shm", NULL, MS_MOVE, NULL);
+
+	/* Create a symlink for the CD drive to /dev/lfs-cd */
+
+	symlink(lfscd, "/.union/dev/lfs-cd");
+
+	mount("/.union/dev/shm/.tmp", "/.union/tmp", NULL, MS_BIND, NULL);
+
+	/* Chroot into the unionfs */
+
+	chdir("/.union");
+
+	mount(".", "/", NULL, MS_MOVE, NULL);
+
+	if ( chroot(".") || chdir("/") )
+		return(0);
+	
+	
+	/* We're done! Pass control to sysvinit. */
+
+	printf("Starting init...\n");
+	i = execve("/sbin/init", init_argv, init_envp);
+	if (i<0)
+		printf("Failed to start init: %s :(\n", strerror(errno));
+
+	return(0);
+}
+
+/* This will look for and mount the LFS LiveCD, if found/mounted it'll return 1, otherwise 0 */
+int mountlfscd(void)
+{
+	struct iso_primary_descriptor pd;
+	int i;
+
+	for(i=0;devices[i]!=NULL;i++)
+	{
+		int fd, status;
+		const char *curdevice = devices[i];
+		char buf[ISO_BLOCK_SIZE];
+
+		/* Try to open CD drive to see if we can use it */
+		fd = open(curdevice, O_RDONLY | O_NONBLOCK);
+		if (fd<0)
+		{
+			/*
+				We'll get here if we can't open the device
+				(No such device, No such file or directory, etc, etc)
+			
+			printf("%s: open failed: %s\n", curdevice, strerror(errno)); */
+			continue; /* On to the next device!! */
+		}
+
+		/* Try to see what the status of the CD drive is */
+		status = ioctl(fd, CDROM_DRIVE_STATUS, 0);
+		if (status<0)
+		{
+			/* We'll probably get here if we open a hard disk */
+			/* printf("%s: ioctl failed: %s\n", curdevice, strerror(errno)); */
+			close(fd);
+			continue; /* On to the next device!! */
+		} 
+
+		close(fd); /* We don't need this fd any more */
+
+		if (status != CDS_DISC_OK)
+		{
+			/* We'll probably get here if there's no CD in the drive */
+			printf("%s: Drive not ready\n", curdevice);
+			continue; /* On to the next device!! */
+		}
+
+		/* If we're here, the cd drive seems to have a disc in it, and is okay! 
+		   Now we'll try to match the Volume ID */
+
+		fd = open(curdevice, O_RDONLY);	
+
+		lseek(fd, ISO_PD_BLOCK*ISO_BLOCK_SIZE, SEEK_SET);
+
+		/* Read the ISO Block info and fill a struct with it */
+
+		read(fd, buf, ISO_BLOCK_SIZE);
+		memcpy( &pd, buf, sizeof(pd) );
+
+  		printf("%s: Volume ID is %s\n", curdevice, pd.volume_id);
+
+		close(fd);
+
+		/* Compare the string in pd.volume_id with the VOLUME_ID
+		   generated by the livecd Makefiles */
+
+		i = strncmp(VOLUME_ID, pd.volume_id, strlen(VOLUME_ID));
+		if (i!=0) {
+			printf("This is not the LFS LiveCD. Moving on...\n");
+			continue;
+		}
+
+		/* Try to mount the cd drive*/
+		status = mount(curdevice, CDROM_MOUNT, CDROM_FSTYPE, MS_RDONLY, NULL);
+		if (status<0)
+		{
+			printf("%s: mount failed: %s\n", curdevice, strerror(errno));
+			continue; /* On to the next device!! */
+		} 
+
+		/* If we're here, we definitely have the LiveCD mounted at the mount point :) */
+
+
+		memset(buf, 0, 32); /* Clear buffer so we don't have to check read's status */
+		read(fd, buf, 10);
+		close(fd);
+
+		/* YAY! we have the LFS LiveCD mounted :) */
+		printf("%s: LFS LiveCD Verified\n", curdevice);
+		lfscd = curdevice;
+		return(1);
+	}
+
+	/* Nuts, can't find an LFS LiveCD anywhere */
+
+	return(0);
+}

Added: x86/trunk/initramfs/init.h
===================================================================
--- x86/trunk/initramfs/init.h	2005-09-09 23:43:47 UTC (rev 639)
+++ x86/trunk/initramfs/init.h	2005-09-17 03:31:30 UTC (rev 640)
@@ -0,0 +1,38 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/mount.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <linux/loop.h>
+#include <linux/cdrom.h>
+#include <linux/fs.h>
+#include <sys/reboot.h>
+#include "iso9660.h"
+
+#define TMPFS		"/.tmpfs"		  	/* Mount point for tmpfs */
+#define CDROM_MOUNT	"/.tmpfs/.cdrom"		/* Mount point for CD */
+#define SQFS		"/.tmpfs/.sqfs"			/* Mount point for squashfs */
+#define SQFS_FILE	"/.tmpfs/.cdrom/.root.sqfs"	/* Squashfs file, root system */
+#define OVERLAY		"/.tmpfs/.overlay"		/* Full path to overlay */
+#define SHM		"/.tmpfs/.overlay/dev/shm"	/* Full path to dev/shm */
+#define PROC		"/.tmpfs/.overlay/proc"		/* Full path to proc */
+#define DEV		"/.tmpfs/.overlay/dev"		/* Full path to dev */
+#define TMP		"/.tmpfs/.overlay/tmp"		/* Full path to tmp */
+#define LOOP		"/dev/loop0"			/* Loopback device */
+
+#define	ISO_BLOCK_SIZE	2048
+#define	ISO_PD_BLOCK	0x10
+
+#define VOLUME_ID	""			/* Volume ID of CD.
+						   This string is automatically set during the
+						   livecd build and needs to match the string passed
+						   to 'mkisofs -V' */
+
+#define CDROM_FSTYPE	"iso9660"           	/* Filesystem of CD */
+#define MAX_RETRIES	3                   	/* How many times to retry scanning for the CD */

Deleted: x86/trunk/initramfs/init.orig
===================================================================
--- x86/trunk/initramfs/init.orig	2005-09-09 23:43:47 UTC (rev 639)
+++ x86/trunk/initramfs/init.orig	2005-09-17 03:31:30 UTC (rev 640)
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# 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
-	for DEV in $DEVS ; do
-		if [ "`isoinfo -V $DEV 2>/dev/null`" = "$LABEL" ] ; then
-			CDROM=$DEV
-		fi
-	done
-	if [ -z "$CDROM" ] ; then
-		echo -n "."
-		TIMEOUT=".$TIMEOUT"
-		sleep 1
-	fi
-done
-
-if [ -z "$CDROM" ] ; then
-	echo "Cannot find LFS Live CD."
-	echo "This probably means that your IDE or SCSI controller is not supported."
-	exit 1
-else
-	echo "LFS Live CD is $CDROM"
-fi
-
-mount -w -t tmpfs -o size=90% tmpfs /.tmpfs
-mkdir /.tmpfs/.overlay
-
-# Probably redundant, but might be useful in the future for ejecting the CD
-mkdir -p /.tmpfs/.overlay/dev/shm /.tmpfs/.overlay/proc
-mkdir -m1777 /.tmpfs/.overlay/tmp
-
-mkdir /.tmpfs/.cdrom
-mkdir /.tmpfs/.sqfs
-
-# Work around unionfs bug that causes tst-cancel16 glibc test to fail in Ch5
-mkdir -m1777 /.tmpfs/.tmp
-
-mount -r -t iso9660 $CDROM /.tmpfs/.cdrom
-losetup /dev/loop0 /.tmpfs/.cdrom/.root.sqfs
-mount -r -t squashfs /dev/loop0 /.tmpfs/.sqfs
-
-# File locking and mmap don't work well on unionfs 1.0.11, this breaks
-# module-init-tools.
-# Fixed in unionfs 1.0.12a, but that version is oopsy when overwriting files.
-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
-
-ln -s $CDROM /.union/dev/lfs-cd
-
-# Work around unionfs bug that causes tst-cancel16 glibc test to fail in Ch5
-mount -o bind /.union/dev/shm/.tmp /.union/tmp
-
-exec run-init /.union /sbin/init

Added: x86/trunk/initramfs/iso9660.h
===================================================================
--- x86/trunk/initramfs/iso9660.h	2005-09-09 23:43:47 UTC (rev 639)
+++ x86/trunk/initramfs/iso9660.h	2005-09-17 03:31:30 UTC (rev 640)
@@ -0,0 +1,158 @@
+/*
+ * Header file iso9660.h - assorted structure definitions and typecasts.
+ * specific to iso9660 filesystem.
+
+   Written by Eric Youngdale (1993).
+
+   Copyright 1993 Yggdrasil Computing, Incorporated
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/*
+ * 	$Id: iso9660.h,v 1.6 1999/10/28 00:55:50 solyga Exp $
+ */
+
+#ifndef _ISOFS_FS_H
+#define _ISOFS_FS_H
+
+/*
+ * The isofs filesystem constants/structures
+ */
+
+/* This part borrowed from the bsd386 isofs */
+#define ISODCL(from, to) (to - from + 1)
+
+struct iso_volume_descriptor {
+	char type[ISODCL(1,1)]; /* 711 */
+	char id[ISODCL(2,6)];
+	char version[ISODCL(7,7)];
+	char data[ISODCL(8,2048)];
+};
+
+/* volume descriptor types */
+#define ISO_VD_PRIMARY       1
+#define ISO_VD_SUPPLEMENTARY 2     /* Used by Joliet */
+#define ISO_VD_END           255
+
+#define ISO_STANDARD_ID "CD001"
+
+#define EL_TORITO_ID "EL TORITO SPECIFICATION"
+#define EL_TORITO_ARCH_x86 0
+#define EL_TORITO_ARCH_PPC 1
+#define EL_TORITO_ARCH_MAC 2
+#define EL_TORITO_BOOTABLE 0x88
+#define EL_TORITO_MEDIA_NOEMUL 0
+#define EL_TORITO_MEDIA_12FLOP  1
+#define EL_TORITO_MEDIA_144FLOP 2
+#define EL_TORITO_MEDIA_288FLOP 3
+#define EL_TORITO_MEDIA_HD      4
+
+struct iso_primary_descriptor {
+	char type			[ISODCL (  1,   1)]; /* 711 */
+	char id				[ISODCL (  2,   6)];
+	char version			[ISODCL (  7,   7)]; /* 711 */
+	char unused1			[ISODCL (  8,   8)];
+	char system_id			[ISODCL (  9,  40)]; /* achars */
+	char volume_id			[ISODCL ( 41,  72)]; /* dchars */
+	char unused2			[ISODCL ( 73,  80)];
+	char volume_space_size		[ISODCL ( 81,  88)]; /* 733 */
+	char escape_sequences		[ISODCL ( 89, 120)];
+	char volume_set_size		[ISODCL (121, 124)]; /* 723 */
+	char volume_sequence_number	[ISODCL (125, 128)]; /* 723 */
+	char logical_block_size		[ISODCL (129, 132)]; /* 723 */
+	char path_table_size		[ISODCL (133, 140)]; /* 733 */
+	char type_l_path_table		[ISODCL (141, 144)]; /* 731 */
+	char opt_type_l_path_table	[ISODCL (145, 148)]; /* 731 */
+	char type_m_path_table		[ISODCL (149, 152)]; /* 732 */
+	char opt_type_m_path_table	[ISODCL (153, 156)]; /* 732 */
+	char root_directory_record	[ISODCL (157, 190)]; /* 9.1 */
+	char volume_set_id		[ISODCL (191, 318)]; /* dchars */
+	char publisher_id		[ISODCL (319, 446)]; /* achars */
+	char preparer_id		[ISODCL (447, 574)]; /* achars */
+	char application_id		[ISODCL (575, 702)]; /* achars */
+	char copyright_file_id		[ISODCL (703, 739)]; /* 7.5 dchars */
+	char abstract_file_id		[ISODCL (740, 776)]; /* 7.5 dchars */
+	char bibliographic_file_id	[ISODCL (777, 813)]; /* 7.5 dchars */
+	char creation_date		[ISODCL (814, 830)]; /* 8.4.26.1 */
+	char modification_date		[ISODCL (831, 847)]; /* 8.4.26.1 */
+	char expiration_date		[ISODCL (848, 864)]; /* 8.4.26.1 */
+	char effective_date		[ISODCL (865, 881)]; /* 8.4.26.1 */
+	char file_structure_version	[ISODCL (882, 882)]; /* 711 */
+	char unused4			[ISODCL (883, 883)];
+	char application_data		[ISODCL (884, 1395)];
+	char unused5			[ISODCL (1396, 2048)];
+};
+
+/* El Torito Boot Record Volume Descriptor */
+struct eltorito_boot_descriptor {
+        char id	           		[ISODCL (  1,    1)]; /* 711 */
+	char id2			[ISODCL (  2,    6)];
+	char version			[ISODCL (  7,    7)]; /* 711 */
+	char system_id			[ISODCL (  8,   39)];
+	char unused2			[ISODCL ( 40,   71)];
+        char bootcat_ptr                [ISODCL ( 72 ,  75)];
+	char unused5			[ISODCL ( 76, 2048)];
+};
+
+/* Validation entry for El Torito */
+struct eltorito_validation_entry {
+        char headerid          		[ISODCL (  1,    1)]; /* 711 */
+	char arch			[ISODCL (  2,    2)];
+	char pad1			[ISODCL (  3,    4)]; /* 711 */
+	char id  			[ISODCL (  5,   28)];
+	char cksum			[ISODCL ( 29,   30)];
+        char key1                       [ISODCL ( 31,   31)];
+	char key2			[ISODCL ( 32,   32)];
+};
+
+/* El Torito initial/default entry in boot catalog */
+struct eltorito_defaultboot_entry {
+        char boot_id           		[ISODCL (  1,    1)]; /* 711 */
+	char boot_media			[ISODCL (  2,    2)];
+	char loadseg			[ISODCL (  3,    4)]; /* 711 */
+	char arch  			[ISODCL (  5,    5)];
+	char pad1			[ISODCL (  6,    6)];
+        char nsect                      [ISODCL (  7,    8)];
+	char bootoff			[ISODCL (  9,   12)];
+        char pad2                       [ISODCL ( 13,   32)];
+};
+
+
+/* We use this to help us look up the parent inode numbers. */
+
+struct iso_path_table{
+	unsigned char  name_len[2];	/* 721 */
+	char extent[4];		/* 731 */
+	char  parent[2];	/* 721 */
+	char name[1];
+};
+
+struct iso_directory_record {
+	unsigned char length			[ISODCL (1, 1)]; /* 711 */
+	char ext_attr_length		[ISODCL (2, 2)]; /* 711 */
+	char extent			[ISODCL (3, 10)]; /* 733 */
+	char size			[ISODCL (11, 18)]; /* 733 */
+	char date			[ISODCL (19, 25)]; /* 7 by 711 */
+	char flags			[ISODCL (26, 26)];
+	char file_unit_size		[ISODCL (27, 27)]; /* 711 */
+	char interleave			[ISODCL (28, 28)]; /* 711 */
+	char volume_sequence_number	[ISODCL (29, 32)]; /* 723 */
+	unsigned char name_len		[ISODCL (33, 33)]; /* 711 */
+	char name			[34]; /* Not really, but we need something here */
+};
+#endif
+
+
+




More information about the livecd mailing list