Author: jhuntwork
Date: 2005-10-01 10:16:21 -0600 (Sat, 01 Oct 2005)
New Revision: 814

Modified:
   x86/trunk/initramfs/Makefile
   x86/trunk/initramfs/init.h
Log:
Cleaned up the way the VOLUME_ID is used - prevents init.h file from getting 
'dirty'

Modified: x86/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile        2005-10-01 14:41:29 UTC (rev 813)
+++ x86/trunk/initramfs/Makefile        2005-10-01 16:16:21 UTC (rev 814)
@@ -49,8 +49,7 @@
        rm -rf temp
 
 init:
-       sed -i '/VOLUME_ID/s@".*"@"lfslivecd-$(VERSION)"@' init.h
-       gcc [EMAIL PROTECTED] -o $@ -static -Os -s -Wall
+       gcc [EMAIL PROTECTED] -o $@ -static -Os -s -Wall 
-DVOLUME_ID=\"lfslivecd-$(VERSION)\"
 
 clean:
        -rm -rf temp

Modified: x86/trunk/initramfs/init.h
===================================================================
--- x86/trunk/initramfs/init.h  2005-10-01 14:41:29 UTC (rev 813)
+++ x86/trunk/initramfs/init.h  2005-10-01 16:16:21 UTC (rev 814)
@@ -29,10 +29,5 @@
 #define        ISO_BLOCK_SIZE  2048
 #define        ISO_PD_BLOCK    0x10
 
-#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

Reply via email to