r1912 - / trunk/BOOK trunk/BOOK/boot/alpha trunk/BOOK/boot/common trunk/BOOK/bootscripts/common trunk/BOOK/chroot/common trunk/BOOK/partitioning/common trunk/BOOK/the-end

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Jul 5 14:25:17 PDT 2006


Author: jim
Date: 2006-07-05 15:25:13 -0600 (Wed, 05 Jul 2006)
New Revision: 1912

Modified:
   /
   trunk/BOOK/INSTALL
   trunk/BOOK/boot/alpha/kernel.xml
   trunk/BOOK/boot/common/pwdgroup.xml
   trunk/BOOK/bootscripts/common/hostname.xml
   trunk/BOOK/bootscripts/common/setclock.xml
   trunk/BOOK/chroot/common/changingowner.xml
   trunk/BOOK/partitioning/common/mounting.xml
   trunk/BOOK/the-end/getcounted.xml
Log:
 r4346 at server (orig r2005):  chris at beaker67.com | 2006-07-05 13:06:51 -0700
 More LFS to CLFS conversions



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2003
   + b6734a72-470d-0410-b049-f317dca95413:/:2005

Modified: trunk/BOOK/INSTALL
===================================================================
--- trunk/BOOK/INSTALL	2006-07-05 19:47:37 UTC (rev 1911)
+++ trunk/BOOK/INSTALL	2006-07-05 21:25:13 UTC (rev 1912)
@@ -1,10 +1,10 @@
-LFS Book Conversion Tools Installation Instructions
+CLFS Book Conversion Tools Installation Instructions
 
 After downloading the SVN source, there are some things that need to be set up 
 on your computer if you want to convert the XML source into something easier to 
 read (e.g. HTML, TXT, or PDF).  If you are interested in this, then keep 
 reading.  If you are only interested in editing the XML source for re- 
-submission to the lfs-book or lfs-dev mailing lists, then you do not need this 
+submission to the clfs-commits or clfs-dev mailing lists, then you do not need this 
 document.  Instead, you need to read the LFS Editor's Manual.  See the LFS 
 website at http://www.linuxfromscratch.org for more information.
 

Modified: trunk/BOOK/boot/alpha/kernel.xml
===================================================================
--- trunk/BOOK/boot/alpha/kernel.xml	2006-07-05 19:47:37 UTC (rev 1911)
+++ trunk/BOOK/boot/alpha/kernel.xml	2006-07-05 21:25:13 UTC (rev 1912)
@@ -91,7 +91,7 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -101,7 +101,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/common/pwdgroup.xml
===================================================================
--- trunk/BOOK/boot/common/pwdgroup.xml	2006-07-05 19:47:37 UTC (rev 1911)
+++ trunk/BOOK/boot/common/pwdgroup.xml	2006-07-05 21:25:13 UTC (rev 1912)
@@ -116,7 +116,7 @@
     </varlistentry>
   </variablelist>
 
-  <para>Create the <filename>${LFS}/etc/group</filename> file by running
+  <para>Create the <filename>${CLFS}/etc/group</filename> file by running
   the following command:</para>
 
 <screen><userinput>cat > ${CLFS}/etc/group << "EOF"

Modified: trunk/BOOK/bootscripts/common/hostname.xml
===================================================================
--- trunk/BOOK/bootscripts/common/hostname.xml	2006-07-05 19:47:37 UTC (rev 1911)
+++ trunk/BOOK/bootscripts/common/hostname.xml	2006-07-05 21:25:13 UTC (rev 1912)
@@ -21,9 +21,9 @@
   <para>Create the <filename>/etc/sysconfig/network</filename> file
   and enter a hostname by running:</para>
 
-  <screen><userinput>echo "HOSTNAME=<replaceable>[lfs]</replaceable>" > /etc/sysconfig/network</userinput></screen>
+  <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" > /etc/sysconfig/network</userinput></screen>
 
-  <para><replaceable>[lfs]</replaceable> needs to be replaced with the
+  <para><replaceable>[clfs]</replaceable> needs to be replaced with the
   name given to the computer. Do not enter the Fully Qualified
   Domain Name (FQDN) here. That information will be put in the
   <filename>/etc/hosts</filename> file in the next section.</para>

Modified: trunk/BOOK/bootscripts/common/setclock.xml
===================================================================
--- trunk/BOOK/bootscripts/common/setclock.xml	2006-07-05 19:47:37 UTC (rev 1911)
+++ trunk/BOOK/bootscripts/common/setclock.xml	2006-07-05 21:25:13 UTC (rev 1912)
@@ -49,7 +49,7 @@
 # End /etc/sysconfig/clock</literal>
 EOF</userinput></screen>
 
-  <para os="e">A good hint explaining how to deal with time on LFS is available
+  <para os="e">A good hint explaining how to deal with time on CLFS is available
   at <ulink url="&hints-root;time.txt"/>. It explains issues such as
   time zones, UTC, and the <envar>TZ</envar> environment variable.</para>
 

Modified: trunk/BOOK/chroot/common/changingowner.xml
===================================================================
--- trunk/BOOK/chroot/common/changingowner.xml	2006-07-05 19:47:37 UTC (rev 1911)
+++ trunk/BOOK/chroot/common/changingowner.xml	2006-07-05 21:25:13 UTC (rev 1912)
@@ -12,7 +12,7 @@
 
     <para os="a">Currently, the <filename class="directory">/tools</filename>
     and <filename class="directory">/cross-tools</filename> directories
-    are owned by the user <emphasis>lfs</emphasis>, a user that
+    are owned by the user <emphasis>clfs</emphasis>, a user that
     exists only on the host system. Although the <filename
     class="directory">/tools</filename> and <filename
     class="directory">/cross-tools</filename> directories can be deleted
@@ -26,7 +26,7 @@
     thus exposing these files to possible malicious manipulation.</para>
 
     <para os="b">To avoid this issue, add the <systemitem
-    class="username">lfs</systemitem> user to the new CLFS system later when
+    class="username">clfs</systemitem> user to the new CLFS system later when
     creating the <filename>/etc/passwd</filename> file, taking care to assign
     it the same user and group IDs as on the host system. Alternatively,
     assign the contents of the <filename class="directory">/tools</filename>

Modified: trunk/BOOK/partitioning/common/mounting.xml
===================================================================
--- trunk/BOOK/partitioning/common/mounting.xml	2006-07-05 19:47:37 UTC (rev 1911)
+++ trunk/BOOK/partitioning/common/mounting.xml	2006-07-05 21:25:13 UTC (rev 1912)
@@ -17,7 +17,7 @@
   class="directory">/mnt/clfs</filename>, but the directory choice is up
   to you.</para>
 
-  <para>Choose a mount point and assign it to the <envar>LFS</envar>
+  <para>Choose a mount point and assign it to the <envar>CLFS</envar>
   environment variable by running:</para>
 
 <screen><userinput>export CLFS=/mnt/clfs</userinput></screen>

Modified: trunk/BOOK/the-end/getcounted.xml
===================================================================
--- trunk/BOOK/the-end/getcounted.xml	2006-07-05 19:47:37 UTC (rev 1911)
+++ trunk/BOOK/the-end/getcounted.xml	2006-07-05 21:25:13 UTC (rev 1912)
@@ -11,10 +11,8 @@
   <title>Get Counted</title>
 
   <para>Now that you have finished the book, do you want to be counted
-  as an LFS user? Head over to <ulink
-  url="&lfs-root;cgi-bin/lfscounter.cgi"/> and register as an LFS user
-  by entering your name and the first LFS version you have used.</para>
+  as a CLFS user? Head over to <ulink
+  url="&lfs-root;cgi-bin/lfscounter.cgi"/> and register as a CLFS user
+  by entering your name and the first CLFS version you have used.</para>
 
-  <para>Let's reboot into LFS now.</para>
-
 </sect1>




More information about the cross-lfs mailing list