Author: jim
Date: 2006-07-08 13:46:03 -0600 (Sat, 08 Jul 2006)
New Revision: 1934
Modified:
/
trunk/BOOK/boot/common/creatingdirs.xml
trunk/BOOK/boot/common/devices.xml
trunk/BOOK/boot/common/fstab.xml
trunk/BOOK/boot/common/pwdgroup.xml
trunk/BOOK/boot/common/sysvinit.xml
trunk/BOOK/boot/mips/sysvinit.xml
trunk/BOOK/boot/sparc/fstab.xml
trunk/BOOK/boot/sparc/sysvinit.xml
trunk/BOOK/boot/x86/grub.xml
trunk/BOOK/boot/x86/kernel.xml
trunk/BOOK/chroot/common/creatingdirs.xml
trunk/BOOK/introduction/common/changelog.xml
Log:
[EMAIL PROTECTED] (orig r2031): [EMAIL PROTECTED] | 2006-07-08 09:09:05 -0700
Removed many ${CLFS} references from explanatory text in the boot section
Property changes on:
___________________________________________________________________
Name: svk:merge
- b6734a72-470d-0410-b049-f317dca95413:/:2029
+ b6734a72-470d-0410-b049-f317dca95413:/:2031
Modified: trunk/BOOK/boot/common/creatingdirs.xml
===================================================================
--- trunk/BOOK/boot/common/creatingdirs.xml 2006-07-08 11:46:58 UTC (rev
1933)
+++ trunk/BOOK/boot/common/creatingdirs.xml 2006-07-08 19:46:03 UTC (rev
1934)
@@ -34,11 +34,11 @@
directories for temporary files.</para>
<para os="d">The first mode change ensures that not just anybody can enter
- the <filename class="directory">${CLFS}/root</filename> directory—the
+ the <filename class="directory">/root</filename> directory—the
same as a normal user would do with his or her home directory. The
second mode change makes sure that any user can write to the
- <filename class="directory">${CLFS}/tmp</filename> and
- <filename class="directory">${CLFS}/var/tmp</filename> directories, but
+ <filename class="directory">/tmp</filename> and
+ <filename class="directory">/var/tmp</filename> directories, but
cannot remove another user's files from them. The latter is prohibited
by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
1777 bit mask.</para>
Modified: trunk/BOOK/boot/common/devices.xml
===================================================================
--- trunk/BOOK/boot/common/devices.xml 2006-07-08 11:46:58 UTC (rev 1933)
+++ trunk/BOOK/boot/common/devices.xml 2006-07-08 19:46:03 UTC (rev 1934)
@@ -8,10 +8,10 @@
<sect1 id="ch-boot-devices">
<?dbhtml filename="devices.html"?>
- <title>Populating ${CLFS}/dev</title>
+ <title>Populating /dev</title>
<indexterm zone="ch-boot-devices">
- <primary sortas="e-${CLFS}/dev/*">${CLFS}/dev/*</primary>
+ <primary sortas="e-/dev/*">/dev/*</primary>
</indexterm>
<sect2>
Modified: trunk/BOOK/boot/common/fstab.xml
===================================================================
--- trunk/BOOK/boot/common/fstab.xml 2006-07-08 11:46:58 UTC (rev 1933)
+++ trunk/BOOK/boot/common/fstab.xml 2006-07-08 19:46:03 UTC (rev 1934)
@@ -8,13 +8,13 @@
<sect1 id="ch-boot-fstab">
<?dbhtml filename="fstab.html"?>
- <title>Creating the ${CLFS}/etc/fstab File</title>
+ <title>Creating the /etc/fstab File</title>
<indexterm zone="ch-boot-fstab">
- <primary sortas="e-${CLFS}/etc/fstab">${CLFS}/etc/fstab</primary>
+ <primary sortas="e-/etc/fstab">/etc/fstab</primary>
</indexterm>
- <para os="a">The <filename>${CLFS}/etc/fstab</filename> file is used by some
+ <para os="a">The <filename>/etc/fstab</filename> file is used by some
programs to determine where file systems are to be mounted by default,
which must be checked, and in which order. Create a new file systems
table like this:</para>
Modified: trunk/BOOK/boot/common/pwdgroup.xml
===================================================================
--- trunk/BOOK/boot/common/pwdgroup.xml 2006-07-08 11:46:58 UTC (rev 1933)
+++ trunk/BOOK/boot/common/pwdgroup.xml 2006-07-08 19:46:03 UTC (rev 1934)
@@ -11,33 +11,33 @@
<title>Creating the passwd, group, and log Files</title>
<indexterm zone="ch-boot-pwdgroup">
- <primary sortas="e-${CLFS}/etc/passwd">${CLFS}/etc/passwd</primary>
+ <primary sortas="e-/etc/passwd">/etc/passwd</primary>
</indexterm>
<indexterm zone="ch-boot-pwdgroup">
- <primary sortas="e-${CLFS}/etc/group">${CLFS}/etc/group</primary>
+ <primary sortas="e-/etc/group">/etc/group</primary>
</indexterm>
<indexterm zone="ch-boot-pwdgroup">
- <primary sortas="e-${CLFS}/var/run/utmp">${CLFS}/var/run/utmp</primary>
+ <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
</indexterm>
<indexterm zone="ch-boot-pwdgroup">
- <primary sortas="e-${CLFS}/var/log/btmp">${CLFS}/var/log/btmp</primary>
+ <primary sortas="e-/var/log/btmp">/var/log/btmp</primary>
</indexterm>
<indexterm zone="ch-boot-pwdgroup">
- <primary
sortas="e-${CLFS}/var/log/lastlog">${CLFS}/var/log/lastlog</primary>
+ <primary sortas="e-/var/log/lastlog">/var/log/lastlog</primary>
</indexterm>
<indexterm zone="ch-boot-pwdgroup">
- <primary sortas="e-${CLFS}/var/log/wtmp">${CLFS}/var/log/wtmp</primary>
+ <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
</indexterm>
<para>In order for user <systemitem class="username">root</systemitem> to
be able to login and for the name <quote>root</quote> to be recognized,
- there must be relevant entries in the <filename>${CLFS}/etc/passwd</filename>
- and <filename>${CLFS}/etc/group</filename> files.</para>
+ there must be relevant entries in the <filename>/etc/passwd</filename>
+ and <filename>/etc/group</filename> files.</para>
<para>Create the <filename>${CLFS}/etc/passwd</filename> file by running
the following command:</para>
@@ -220,11 +220,11 @@
chmod -v 664 ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog
chmod -v 600 ${CLFS}/var/log/btmp</userinput></screen>
- <para>The <filename>${CLFS}/var/run/utmp</filename> file records the users
- that are currently logged in. The <filename>${CLFS}/var/log/wtmp</filename>
+ <para>The <filename>/var/run/utmp</filename> file records the users
+ that are currently logged in. The <filename>/var/log/wtmp</filename>
file records all logins and logouts. The
- <filename>${CLFS}/var/log/lastlog</filename> file records when
- each user last logged in. The <filename>${CLFS}/var/log/btmp</filename> file
+ <filename>/var/log/lastlog</filename> file records when
+ each user last logged in. The <filename>/var/log/btmp</filename> file
records the bad login attempts.</para>
</sect1>
Modified: trunk/BOOK/boot/common/sysvinit.xml
===================================================================
--- trunk/BOOK/boot/common/sysvinit.xml 2006-07-08 11:46:58 UTC (rev 1933)
+++ trunk/BOOK/boot/common/sysvinit.xml 2006-07-08 19:46:03 UTC (rev 1934)
@@ -56,7 +56,7 @@
</indexterm>
<indexterm zone="conf-tools-sysvinit">
- <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
+ <primary sortas="e-/etc/inittab">/etc/inittab</primary>
</indexterm>
<para os="ae">Create a new file <filename>${CLFS}/etc/inittab</filename> by
Modified: trunk/BOOK/boot/mips/sysvinit.xml
===================================================================
--- trunk/BOOK/boot/mips/sysvinit.xml 2006-07-08 11:46:58 UTC (rev 1933)
+++ trunk/BOOK/boot/mips/sysvinit.xml 2006-07-08 19:46:03 UTC (rev 1934)
@@ -57,7 +57,7 @@
</indexterm>
<indexterm zone="conf-tools-sysvinit">
- <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
+ <primary sortas="e-/etc/inittab">/etc/inittab</primary>
</indexterm>
<para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
Modified: trunk/BOOK/boot/sparc/fstab.xml
===================================================================
--- trunk/BOOK/boot/sparc/fstab.xml 2006-07-08 11:46:58 UTC (rev 1933)
+++ trunk/BOOK/boot/sparc/fstab.xml 2006-07-08 19:46:03 UTC (rev 1934)
@@ -8,10 +8,10 @@
<sect1 id="ch-boot-fstab">
<?dbhtml filename="fstab.html"?>
- <title>Creating the ${CLFS}/etc/fstab File</title>
+ <title>Creating the /etc/fstab File</title>
<indexterm zone="ch-boot-fstab">
- <primary sortas="e-${CLFS}/etc/fstab">${CLFS}/etc/fstab</primary>
+ <primary sortas="e-/etc/fstab">/etc/fstab</primary>
</indexterm>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Modified: trunk/BOOK/boot/sparc/sysvinit.xml
===================================================================
--- trunk/BOOK/boot/sparc/sysvinit.xml 2006-07-08 11:46:58 UTC (rev 1933)
+++ trunk/BOOK/boot/sparc/sysvinit.xml 2006-07-08 19:46:03 UTC (rev 1934)
@@ -57,7 +57,7 @@
</indexterm>
<indexterm zone="conf-tools-sysvinit">
- <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
+ <primary sortas="e-/etc/inittab">/etc/inittab</primary>
</indexterm>
<para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
Modified: trunk/BOOK/boot/x86/grub.xml
===================================================================
--- trunk/BOOK/boot/x86/grub.xml 2006-07-08 11:46:58 UTC (rev 1933)
+++ trunk/BOOK/boot/x86/grub.xml 2006-07-08 19:46:03 UTC (rev 1934)
@@ -63,7 +63,7 @@
xpointer="xpointer(//[EMAIL PROTECTED]'m'])"/>
<para os="n">If all went well, GRUB will have reported finding its files
- in <filename class="directory">${CLFS}/boot/grub</filename>. That's
+ in <filename class="directory">/boot/grub</filename>. That's
all there is to it. Quit the <command>grub</command> shell:</para>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Modified: trunk/BOOK/boot/x86/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86/kernel.xml 2006-07-08 11:46:58 UTC (rev 1933)
+++ trunk/BOOK/boot/x86/kernel.xml 2006-07-08 19:46:03 UTC (rev 1934)
@@ -71,7 +71,7 @@
<screen><userinput>make ARCH=i386
CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
<para os="af">If the use of kernel modules can't be avoided, an
- <filename>${CLFS}/etc/modprobe.conf</filename> file may be needed.
+ <filename>/etc/modprobe.conf</filename> file may be needed.
Information pertaining to modules and kernel configuration is
located in the kernel documentation in the <filename
class="directory">Documentation</filename> directory of the kernel
Modified: trunk/BOOK/chroot/common/creatingdirs.xml
===================================================================
--- trunk/BOOK/chroot/common/creatingdirs.xml 2006-07-08 11:46:58 UTC (rev
1933)
+++ trunk/BOOK/chroot/common/creatingdirs.xml 2006-07-08 19:46:03 UTC (rev
1934)
@@ -32,15 +32,9 @@
href="../../boot/common/creatingdirs.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
- <para os="d">The first mode change ensures that not just anybody can enter
- the <filename class="directory">/root</filename> directory—the
- same as a normal user would do with his or her home directory. The
- second mode change makes sure that any user can write to the
- <filename class="directory">/tmp</filename> and
- <filename class="directory">/var/tmp</filename> directories, but
- cannot remove another user's files from them. The latter is prohibited
- by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
- 1777 bit mask.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../../boot/common/creatingdirs.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../../boot/common/creatingdirs.xml"
Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml 2006-07-08 11:46:58 UTC
(rev 1933)
+++ trunk/BOOK/introduction/common/changelog.xml 2006-07-08 19:46:03 UTC
(rev 1934)
@@ -43,11 +43,15 @@
<para>[jim] - Updated to linux-2.6.17.4 and
linux-headers-2.6.17.4-07072006.</para>
</listitem>
+ <listitem>
+ <para>[Chris] - Removed many "${CLFS}" references from explanatory
+ text in boot section.</para>
+ </listitem>
</itemizedlist>
</listitem>
<listitem>
- <para>July 6, 2006</para>
+ <para>July 7, 2006</para>
<itemizedlist>
<listitem>
<para>[Chris] - Modified the "creating directories" sections -
--
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
