diff options
| author | Dan Nichilson <dnicholson@linuxfromscratch.org> | 2007-08-08 18:36:09 +0000 |
|---|---|---|
| committer | Dan Nichilson <dnicholson@linuxfromscratch.org> | 2007-08-08 18:36:09 +0000 |
| commit | ded2472aa212e24584e44ee8d7f2811f974ff1d6 (patch) | |
| tree | c0b910e598ee5260874ac01ac71ed32e5b1262e0 | |
| parent | 587c5b9082f496b3195f4de13ab6f3e4282645d3 (diff) | |
Merge r8299 from trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.3/BOOK@8300 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter07/network.xml | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 6bccd837d..884327ce8 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -41,6 +41,10 @@ <para>2007-08-08</para> <itemizedlist> <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 diff --git a/chapter07/network.xml b/chapter07/network.xml index dc4f05a8f..f3159a571 100644 --- a/chapter07/network.xml +++ b/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> |