r649 - x86/trunk/initramfs

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Sep 17 05:25:43 PDT 2005


Author: jhuntwork
Date: 2005-09-17 06:25:42 -0600 (Sat, 17 Sep 2005)
New Revision: 649

Modified:
   x86/trunk/initramfs/init.c
Log:
Some minor tweaks to the init.c

Modified: x86/trunk/initramfs/init.c
===================================================================
--- x86/trunk/initramfs/init.c	2005-09-17 12:11:49 UTC (rev 648)
+++ x86/trunk/initramfs/init.c	2005-09-17 12:25:42 UTC (rev 649)
@@ -50,12 +50,14 @@
 	mkdir(SQFS, 0755);			     /* Create a .sqfs directory */
 	mkdir("/.tmpfs/.tmp",1777);		     /* Create a .tmp directory */
 
+	printf("Searching for the CD named %s...\n", VOLUME_ID);
+
 	for (i=0;i<MAX_RETRIES;i++)
 	{
 		if (mountlfscd())
 			break;
 
-		/* Failed to find any device with an lfs boot cd in :( */
+		/* Failed to find any device with an LFS LiveCD */
 		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);
@@ -68,9 +70,9 @@
 		return(0);
 	}
 
-	/* If we're here, we have an LFS CD mounted and verified
+	/* If we're here, we have the LiveCD mounted and verifieid */
 	
-	Attempt to attach the squashfs root file to /dev/loop0 */
+	/* Now, attempt to attach the squashfs root file to /dev/loop0 */
 
 	printf("Setting up the loopback device...\n");
 
@@ -183,7 +185,8 @@
 		status = ioctl(fd, CDROM_DRIVE_STATUS, 0);
 		if (status<0)
 		{
-			/* We'll probably get here if we open a hard disk */
+			/* We'll probably get here if we open a hard disk.
+			   No need to always print out this error. */
 			/* printf("%s: ioctl failed: %s\n", curdevice, strerror(errno)); */
 			close(fd);
 			continue; /* On to the next device!! */
@@ -219,7 +222,7 @@
 
 		i = strncmp(VOLUME_ID, pd.volume_id, strlen(VOLUME_ID));
 		if (i!=0) {
-			printf("This is not the LFS LiveCD. Moving on...\n");
+			printf("This is not the correct CD. Moving on...\n");
 			continue;
 		}
 




More information about the livecd mailing list