Revised explanation for /etc/modprobe.conf.

Update udev-lfs init-net-rules.sh script for "en*" devices 
introduced in systemd-197


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10094 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 30 insertions, 12 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f608b1df0..1e7a2280e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,21 @@
     </listitem>
 -->
     <listitem>
+      <para>2013-01-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Revised explanation for /etc/modprobe.conf.
+          Fixes <ulink url="&lfs-ticket-root;3270">#3270</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update udev-lfs init-net-rules.sh
+          script for "en*" devices introduced in systemd-197.  
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-01-09</para>
       <itemizedlist>
         <listitem>
@@ -49,7 +64,6 @@
       </itemizedlist>
     </listitem>
 
-
     <listitem>
       <para>2013-01-02</para>
       <itemizedlist>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index a448f88e6..fbca889fb 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -196,11 +196,14 @@ cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen>
       <primary sortas="e-/etc/modprobe.d/usb.conf">/etc/modprobe.d/usb.conf</primary>
     </indexterm>
 
-    <para>The <filename>/etc/modprobe.d/usb.conf</filename> file needs to be
-    created so that if the USB drivers (ehci_hcd, ohci_hcd and uhci_hcd) have
-    been built as modules, they will be loaded in the correct order; ehci_hcd
-    needs to be loaded prior to ohci_hcd and uhci_hcd in order to avoid a
-    warning being output at boot time.</para>
+    <para>Most of the time Linux modules are loaded automatically, but
+    sometimes it needs some specific direction.  The program that loads
+    modules, <command>modprobe</command> or <command>insmod</command>, uses
+    <filename>/etc/modprobe.d/usb.conf</filename> for this purpose.  This file
+    needs to be created so that if the USB drivers (ehci_hcd, ohci_hcd and
+    uhci_hcd) have been built as modules, they will be loaded in the correct
+    order; ehci_hcd needs to be loaded prior to ohci_hcd and uhci_hcd in order
+    to avoid a warning being output at boot time.</para>
 
     <para>Create a new file <filename>/etc/modprobe.d/usb.conf</filename> by running
     the following:</para>
diff --git a/general.ent b/general.ent
index 710daff68..f24277b00 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20130109">
-<!ENTITY releasedate "January 2, 2019">
+<!ENTITY version "SVN-20130111">
+<!ENTITY releasedate "January 11, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index de8da51e8..de026ae17 100644
--- a/packages.ent
+++ b/packages.ent
@@ -540,10 +540,10 @@
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-1">
+<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-2">
 <!ENTITY udev-lfs-size   "17 KB">
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
-<!ENTITY udev-lfs-md5    "4534a2760481a24f3c1dc611c6932a0d">
+<!ENTITY udev-lfs-md5    "f4272c121514caf0c2a6245fbffeb047">
 <!ENTITY udev-lfs-home   " ">
 
 <!ENTITY util-linux-version "2.22.2">
diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs
index c998d9e13..5978a50d9 100644
--- a/udev-lfs/Makefile.lfs
+++ b/udev-lfs/Makefile.lfs
@@ -5,7 +5,7 @@
 
 SHELL=/bin/bash
 SYSTEMD_VERSION=197
-VERSION=197-1
+VERSION=197-2
 
 ifeq ($(V),)
  VB = @
diff --git a/udev-lfs/init-net-rules.sh b/udev-lfs/init-net-rules.sh
index 1e65794ab..691d93c77 100644
--- a/udev-lfs/init-net-rules.sh
+++ b/udev-lfs/init-net-rules.sh
@@ -2,9 +2,10 @@
 
 # This script generates rules for persistent network device naming
 # Data from udev-182 75-persistent-net-generator.rules
+# Updated fof udev-197 (DEVICES=en*)
 
 RULES=/etc/udev/rules.d/70-persistent-net.rules 
-DEVICES=$(eval echo /sys/class/net/{eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*})
+DEVICES=$(eval echo /sys/class/net/{en*,eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*})
 
 function usage
 {