r317 - in x86/trunk: . doc etc packages/Xorg

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sat Jul 9 17:51:08 PDT 2005


Author: justin
Date: 2005-07-09 18:51:07 -0600 (Sat, 09 Jul 2005)
New Revision: 317

Modified:
   x86/trunk/Makefile
   x86/trunk/doc/README
   x86/trunk/etc/issue
   x86/trunk/packages/Xorg/Makefile
Log:
Merged r316 from 6.1 to trunk.

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-07-10 00:24:46 UTC (rev 316)
+++ x86/trunk/Makefile	2005-07-10 00:51:07 UTC (rev 317)
@@ -1433,6 +1433,8 @@
 	@install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/isolinux
 	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue
 	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
+	@install -m644 doc/README $(MP)/root/README
+	@sed -i "s/[version]/$(VERSION)/" $(MP)/root/README
 	@install -m600 root/.bashrc $(MP)/root/.bashrc
 	@install -m644 etc/X11/app-defaults/XTerm $(MP)/etc/X11/app-defaults/XTerm
 	@install -m644 etc/X11/twm/system.twmrc $(MP)/etc/X11/twm/system.twmrc

Modified: x86/trunk/doc/README
===================================================================
--- x86/trunk/doc/README	2005-07-10 00:24:46 UTC (rev 316)
+++ x86/trunk/doc/README	2005-07-10 00:51:07 UTC (rev 317)
@@ -1,5 +1,4 @@
 This is version [version] of the official Linux From Scratch LiveCD.
-Built on [build-date].
 
 PACKAGES
 ================

Modified: x86/trunk/etc/issue
===================================================================
--- x86/trunk/etc/issue	2005-07-10 00:24:46 UTC (rev 316)
+++ x86/trunk/etc/issue	2005-07-10 00:51:07 UTC (rev 317)
@@ -1,18 +1,21 @@
 
-This is the Official Linux From Scratch LiveCD
+This is the Official Linux From Scratch LiveCD
 Created by:
 Jeremy Huntwork, Project Leader
 Alexander Patrakov, Maintainer, i18n
-
+Justin Knierim, Maintainer
+
 Version:
-____________________________________________________________
+____________________________________________________________
 
+Please read the /root/README file before using this CD.
+
 All the source packages you will need to build an LFS system
-are located in /sources and you can find the book in
-/usr/share/LFS-BOOK-6.1-HTML.
+are located in /sources and you can find the book in
+/usr/share/LFS-BOOK-6.1-HTML.
 
 Support questions concerning this cd should be directed to
-livecd at linuxfromscratch.org
+livecd at linuxfromscratch.org
 
 Type "greeting" at any time to view this message again.
 

Modified: x86/trunk/packages/Xorg/Makefile
===================================================================
--- x86/trunk/packages/Xorg/Makefile	2005-07-10 00:24:46 UTC (rev 316)
+++ x86/trunk/packages/Xorg/Makefile	2005-07-10 00:51:07 UTC (rev 317)
@@ -40,7 +40,7 @@
 	 ln -sf ../X11R6/lib/X11 /usr/lib/X11 && \
 	 ln -sf ../X11R6/include/X11 /usr/include/X11 && \
 	 /sbin/ldconfig ; fi
-	@echo "/tmp/.ICE-unix dir 1777 root root" >> /etc/sysconfig/createfiles
+#	@echo "/tmp/.ICE-unix dir 1777 root root" >> /etc/sysconfig/createfiles
 	@echo -e "#!/bin/sh\nexec /usr/X11R6/bin/X -nolisten tcp" >/etc/X11/xinit/xserverrc
 	@chmod 755 /etc/X11/xinit/xserverrc
 	@install -m644 $(ROOT)/etc/X11/xorg.conf /etc/X11/xorg.conf




More information about the livecd mailing list