r1558 - in trunk: . etc

[jhuntwork]

Author: jhuntwork
Date: 2006-05-22 09:38:48 -0600 (Mon, 22 May 2006)
New Revision: 1558

Modified:
   trunk/Makefile
   trunk/etc/issue
Log:
Adjust etc/issue for minimal and full targets

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile      2006-05-22 15:30:18 UTC (rev 1557)
+++ trunk/Makefile      2006-05-22 15:38:48 UTC (rev 1558)
@@ -190,12 +190,16 @@
        @cp $(ROOT)/scripts/unpack $(MP)/bin
        @chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
         make blfs $(chbash-post-bash)'
+       @install -m644 etc/issue $(MP)/etc/issue
 
 extend-minimal: $(MP)$(ROOT)
        @cp $(WD)/bin/which $(MP)/usr/bin
        @cp $(ROOT)/scripts/unpack $(MP)/bin
        @chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
         make blfs-minimal $(chbash-post-bash)'
+       @rm -rf $(LFSSRC) $(MP)$(LFSSRC)
+       @sed '/sources/d' etc/issue >$(MP)/etc/issue
+       @chmod 644 $(MP)/etc/issue
 
 lfsuser:
        @-groupadd lfs
@@ -383,7 +387,6 @@
        @>$(MP)/var/log/btmp
        @>$(MP)/var/log/wtmp
        @>$(MP)/var/log/lastlog
-       @install -m644 etc/issue $(MP)/etc/issue
 ifeq ($(LFS-ARCH),x86)
        @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} 
$(MP)/boot/isolinux
        @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg

Modified: trunk/etc/issue
===================================================================
--- trunk/etc/issue     2006-05-22 15:30:18 UTC (rev 1557)
+++ trunk/etc/issue     2006-05-22 15:38:48 UTC (rev 1558)
@@ -11,12 +11,11 @@
 
 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 /lfs-sources.  You can find the
-LFS book in /usr/share/LFS-BOOK-trunk-HTML.
+All the source packages you will need to build an LFS system are located in 
/lfs-sources.
 
-Support questions concerning this CD should be directed to
-[1;[EMAIL PROTECTED]
+You can find the LFS book in /usr/share/LFS-BOOK-trunk-HTML.
 
-Type "greeting" at any time to view this message again.
+Support questions concerning this CD should be directed to [1;[EMAIL 
PROTECTED]
 
+Type greeting at any time to view this message again.
+

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page