Explorar o código

Merge r8294-r8297, r8299 and r8302 from trunk

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8303 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Jeremy Huntwork %!s(int64=18) %!d(string=hai) anos
pai
achega
ea8f9e2463
Modificáronse 4 ficheiros con 29 adicións e 8 borrados
  1. 20 0
      chapter01/changelog.xml
  2. 3 2
      chapter06/bash.xml
  3. 2 2
      chapter06/pkgmgt.xml
  4. 4 4
      chapter07/network.xml

+ 20 - 0
chapter01/changelog.xml

@@ -70,6 +70,26 @@
         <listitem>
           <para>[jhuntwork] - Since we're using HJL Binutils, add m4, bison and flex
 	  back to chatper 5.</para>
+	</listitem>
+	<listitem>
+          <para>[dnicholson] - Clarify the description of the Udev persistent
+          network rules file.</para>
+        </listitem>
+        <listitem>
+          <para>[dnicholson] - Redirected <filename
+          class="devicefile">/dev/tty</filename> to standard input when
+          running the Bash testsuite to prevent errors with terminal
+          permissions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2007-08-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Added the <parameter>--disable-werror</parameter>
+          parameter to Binutils Pass 1.</para>
         </listitem>
 	<listitem>
 	  <para>[jhuntwork] - Upgraded to GCC 4.2.1</para>

+ 3 - 2
chapter06/bash.xml

@@ -81,9 +81,10 @@ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
 chown -Rv nobody ./</userinput></screen>
 
     <para>Now, run the tests as the <systemitem
-    class="username">nobody</systemitem> user:</para>
+    class="username">nobody</systemitem> user, ensuring that the standard
+    input device is readable:</para>
 
-<screen><userinput>su-tools nobody -s /bin/bash -c "make tests"</userinput></screen>
+<screen><userinput>su-tools nobody -s /bin/bash -c "make tests" &lt;/dev/tty</userinput></screen>
 
     <para>Install the package:</para>
 

+ 2 - 2
chapter06/pkgmgt.xml

@@ -36,7 +36,7 @@
   </itemizedlist>
 
   <para>There are some hints written on the topic of package management. Visit
-  the <ulink url="&hints-root;">Hints subproject</ulink> and see if one of them
+  the <ulink url="&hints-index;">Hints Project</ulink> and see if one of them
   fits your need.</para>
 
   <sect2>
@@ -221,7 +221,7 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
       <title>User Based Management</title>
 
       <para>This scheme, unique to LFS, was devised by Matthias Benkmann, and is
-      available from the <ulink url="&hints-root;">Hints Project</ulink>. In
+      available from the <ulink url="&hints-index;">Hints Project</ulink>. In
       this scheme, each package is installed as a separate user into the
       standard locations. Files belonging to a package are easily identified by
       checking the user ID. The features and shortcomings of this approach are

+ 4 - 4
chapter07/network.xml

@@ -46,10 +46,10 @@
 
 <screen><userinput>cat /etc/udev/rules.d/70-persistent-net.rules</userinput></screen>
 
-    <para>Each NIC takes up two lines in the file. The first line is a
-    description of the NIC itself, showing its hardware IDs (e.g. its PCI
-    vendor and device IDs, if it's a PCI card), along with its driver in
-    parentheses, if the driver can be found. This line is a comment; neither
+    <para>The file begins with a comment block followed by two lines for each
+    NIC. The first line for each NIC is a commented description showing its
+    hardware IDs (e.g. its PC vendor and device IDs, if it's a PCI card),
+    along with its driver in parentheses, if the driver can be found. Neither
     the hardware ID nor the driver is used to determine which name to give an
     interface. The second line is the Udev rule that matches this NIC and
     actually assigns it a name.</para>