r799 - x86/trunk/initramfs

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Sep 27 23:10:17 PDT 2005


Author: justin
Date: 2005-09-28 00:10:17 -0600 (Wed, 28 Sep 2005)
New Revision: 799

Modified:
   x86/trunk/initramfs/Makefile
   x86/trunk/initramfs/init.h
Log:
Changed init setup to echo VOLUME_ID to volume.h and include it, instead of sed'ing init.h, which isn't cleaned up during a make clean.

Modified: x86/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile	2005-09-28 05:19:33 UTC (rev 798)
+++ x86/trunk/initramfs/Makefile	2005-09-28 06:10:17 UTC (rev 799)
@@ -49,12 +49,13 @@
 	rm -rf temp
 
 init:
-	sed -i '/VOLUME_ID/s@".*"@"lfslivecd-$(VERSION)"@' init.h
+	echo "#define VOLUME_ID \"lfslivecd-$(VERSION)\"" > volume.h
 	gcc $@.c -o $@ -static -Os -s -Wall
 
 clean:
 	-rm -rf temp
 	-rm -f initramfs_data*
 	-rm -f init
+	-rm volume.h
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/initramfs/init.h
===================================================================
--- x86/trunk/initramfs/init.h	2005-09-28 05:19:33 UTC (rev 798)
+++ x86/trunk/initramfs/init.h	2005-09-28 06:10:17 UTC (rev 799)
@@ -29,10 +29,9 @@
 #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' */
+/* Volume ID of CD.  This string is automatically set during the
+livecd build and needs to match the string passed to 'mkisofs -V' */
+#include "volume.h"
 
 #define CDROM_FSTYPE	"iso9660"           	/* Filesystem of CD */
 #define MAX_RETRIES	3                   	/* How many times to retry scanning for the CD */




More information about the livecd mailing list