Author: justin
Date: 2005-09-28 00:17:39 -0600 (Wed, 28 Sep 2005)
New Revision: 801
Modified:
x86/trunk/initramfs/Makefile
x86/trunk/initramfs/init.h
Log:
Sorry for the noise, the changes to init were unnecessary and the previous
version works. Reverting change.
Modified: x86/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile 2005-09-28 06:13:18 UTC (rev 800)
+++ x86/trunk/initramfs/Makefile 2005-09-28 06:17:39 UTC (rev 801)
@@ -49,13 +49,12 @@
rm -rf temp
init:
- echo "#define VOLUME_ID \"lfslivecd-$(VERSION)\"" > volume.h
+ sed -i '/VOLUME_ID/s@".*"@"lfslivecd-$(VERSION)"@' init.h
gcc [EMAIL PROTECTED] -o $@ -static -Os -s -Wall
clean:
-rm -rf temp
-rm -f initramfs_data*
-rm -f init
- -rm -f volume.h
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/initramfs/init.h
===================================================================
--- x86/trunk/initramfs/init.h 2005-09-28 06:13:18 UTC (rev 800)
+++ x86/trunk/initramfs/init.h 2005-09-28 06:17:39 UTC (rev 801)
@@ -29,9 +29,10 @@
#define ISO_BLOCK_SIZE 2048
#define ISO_PD_BLOCK 0x10
-/* 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 VOLUME_ID "lfslive-$VERSION" /* 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 */
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
