Move custom CD symlink and custom NIC name rules files to 70-persistent-*.rules, and add ENV{GENERATED} to the CD symlink rules. Prevents Udev rule_generator stuff from conflicting.

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

4 files changed, 27 insertions, 10 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3e9597410..5962ed0e2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
 -->
 
     <listitem>
+      <para>2006-11-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bryan] - Use 70-persistent-*.rules for custom symlinks
+          and NIC naming, and add ENV{GENERATED} to the CD symlink rule.
+          Gets #1912 closer to really being fixed.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2006-11-05</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index f03a2989a..6e4937d77 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -48,7 +48,7 @@
     invent a descriptive name, such as <quote>realtek</quote>, and create
     Udev rules similar to the following:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/26-network.rules &lt;&lt; EOF
+<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/70-persistent-net.rules &lt;&lt; EOF
 <literal>ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="<replaceable>00:e0:4c:12:34:56</replaceable>", \
     NAME="<replaceable>realtek</replaceable>"
 ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="<replaceable>00:a0:c9:78:9a:bc</replaceable>", \
@@ -95,7 +95,7 @@ done</userinput></screen>
   
     <para>Now create Udev rules similar to the following:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/26-network.rules &lt;&lt; EOF
+<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/70-persistent-net.rules &lt;&lt; EOF
 <literal>ACTION=="add", SUBSYSTEM=="net", BUS=="<replaceable>pci</replaceable>", KERNELS=="<replaceable>0000:00:0c.0</replaceable>", \
     NAME="<replaceable>realtek</replaceable>"
 ACTION=="add", SUBSYSTEM=="net", BUS=="<replaceable>pci</replaceable>", KERNELS=="<replaceable>0000:00:0d.0</replaceable>", \
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index e8a27d7ef..f3c4b17c5 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -32,13 +32,13 @@
     location of the device on the bus. If you are going to use the first
     approach, create a file similar to the following:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
+<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/70-persistent-cd.rules &lt;&lt; EOF
 <literal>
 # Custom CD-ROM symlinks
 SUBSYSTEM=="block", ENV{ID_MODEL}=="SAMSUNG_CD-ROM_SC-148F", \
-    ENV{ID_REVISION}=="PS05", SYMLINK+="cdrom"
+    ENV{ID_REVISION}=="PS05", ENV{GENERATED}="1", SYMLINK+="cdrom"
 SUBSYSTEM=="block", ENV{ID_MODEL}=="PHILIPS_CDD5301", \
-    ENV{ID_SERIAL}=="5VO1306DM00190", SYMLINK+="cdrom1 dvd"
+    ENV{ID_SERIAL}=="5VO1306DM00190", ENV{GENERATED}="1", SYMLINK+="cdrom1 dvd"
 </literal>
 EOF</userinput></screen>
 
@@ -68,15 +68,21 @@ EOF</userinput></screen>
     <filename>/dev/srX</filename> devices, and sometimes to
     <filename>/dev/sgX</filename>, which is wrong.</para>
 
+    <para>The ENV{GENERATED}="1" key is needed to prevent the Udev
+    75-cd-aliases-generator.rules file from overriding your custom
+    rules.</para>
+
     <para>The second approach yields:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
+<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/70-persistent-cd.rules &lt;&lt; EOF
 <literal>
 # Custom CD-ROM symlinks
 SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
-    ENV{ID_PATH}=="pci-0000:00:07.1-ide-0:1", SYMLINK+="cdrom"
+    ENV{ID_PATH}=="pci-0000:00:07.1-ide-0:1", \
+    ENV{GENERATED}="1", SYMLINK+="cdrom"
 SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
-    ENV{ID_PATH}=="pci-0000:00:07.1-ide-1:1", SYMLINK+="cdrom1 dvd"
+    ENV{ID_PATH}=="pci-0000:00:07.1-ide-1:1", \
+    ENV{GENERATED}="1", SYMLINK+="cdrom1 dvd"
 </literal>
 EOF</userinput></screen>
 
diff --git a/general.ent b/general.ent
index e3eaedc70..5bc43bca2 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20061105">
-<!ENTITY releasedate "November 5, 2006">
+<!ENTITY version "SVN-20061110">
+<!ENTITY releasedate "November 10, 2006">
 <!ENTITY milestone "6.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->