Updated to udev-091. Moved to a tarball-based set of udev rules. Updated the bootscripts to support the new udevsettle program.

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

5 files changed, 77 insertions, 26 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 87e1077de..096960c67 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
 -->
 
     <listitem>
+      <para>May 1, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[archaic] - Updated to udev-091. Moved to a tarball-based set of
+          udev rules. Updated the bootscripts to support the new udevsettle
+          program.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 27, 2006</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index bcac786af..deac055e1 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -249,6 +249,9 @@
     <listitem>
       <para>&texinfo-tempfile_fix-patch;</para>
     </listitem>
+    <listitem>
+      <para>&udev-config;</para>
+    </listitem>
   </itemizedlist>
 
   <itemizedlist>
@@ -288,6 +291,9 @@
       <para>perl-5.8.6-libc-1.patch</para>
     </listitem>
     <listitem>
+      <para>udev-config-4.rules</para>
+    </listitem>
+    <listitem>
       <para>vim-6.3-security_fix-1.patch</para>
     </listitem>
     <listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 1095916bc..e6682c66e 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -524,10 +524,10 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Udev Rules Configuration - 5 KB:</term>
+      <term>Udev Configuration Tarball - 4 KB:</term>
       <listitem>
         <para>Download: <ulink
-        url="http://downloads.linuxfromscratch.org/&udev-config-file;"/></para>
+        url="http://downloads.linuxfromscratch.org/&udev-config;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 9125ba226..1591192d0 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -35,6 +35,11 @@
   <sect2 role="installation">
     <title>Installation of Udev</title>
 
+    <para>The udev-config tarball contains LFS-specific files used to configure
+    Udev.</para>
+
+<screen><userinput>tar xf ../&udev-config;.tar.bz2</userinput></screen>
+
     <para>Create some devices and directories that Udev cannot handle due to
     them being required very early in the boot process:</para>
 
@@ -49,8 +54,8 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
     <para>Compile the package:</para>
 
 <screen><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
-            extras/firmware extras/floppy extras/scsi_id \
-            extras/usb_id extras/volume_id"</userinput></screen>
+            extras/firmware extras/floppy extras/path_id \
+            extras/scsi_id extras/usb_id extras/volume_id"</userinput></screen>
 
     <variablelist>
       <title>The meaning of the make option:</title>
@@ -72,8 +77,8 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
 
 <screen><userinput>make DESTDIR=/ \
     EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
-            extras/firmware extras/floppy extras/scsi_id \
-            extras/usb_id extras/volume_id" install</userinput></screen>
+            extras/firmware extras/floppy extras/path_id \
+            extras/scsi_id extras/usb_id extras/volume_id" install</userinput></screen>
 
     <variablelist>
       <title>The meaning of the make parameter:</title>
@@ -92,15 +97,18 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
     <para>Udev's configuration is far from ideal by default, so install
     the configuration files here:</para>
 
-<screen><userinput>cp -v ../&udev-config-file; /etc/udev/rules.d/25-lfs.rules</userinput></screen>
+<!-- FIXME: 90-bug.rules should be removed once the book is released -->
+<screen><userinput>cp &udev-config;/05-udev-early.rules /etc/udev/rules.d/
+cp &udev-config;/25-lfs.rules /etc/udev/rules.d/
+cp &udev-config;/60-persistent-storage.rules /etc/udev/rules.d/
+cp &udev-config;/81-cdrom.rules /etc/udev/rules.d/
+cp &udev-config;/83-cdrom-symlinks.rules /etc/udev/rules.d/
+cp &udev-config;/90-bug.rules /etc/udev/rules.d/</userinput></screen>
 
-    <para>Create some rules that work around broken sysfs attribute creation
-    timing in linux-2.6.15:</para>
+    <para>Now install a helper script that is not included in the main Udev
+    tarball:</para>
 
-<screen><userinput>cat &gt; /etc/udev/rules.d/10-wait_for_sysfs.rules &lt;&lt; "EOF"
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-EOF</userinput></screen>
+<screen><userinput>install -m 744 &udev-config;/write_cd_aliases /lib/udev/</userinput></screen>
 
     <para>Install the documentation that explains how to create Udev rules:</para>
 
@@ -155,12 +163,6 @@ EOF</userinput></screen>
 
 <screen><userinput>gcc -o /lib/udev/bug bug.c</userinput></screen>
 
-      <para>The next step adds a simple logging rule to run this program.</para>
-
-<screen><userinput>cat &gt; /etc/udev/rules.d/90-bug.rules &lt;&lt; "EOF"
-<literal>ACTION=="add", RUN+="bug"</literal>
-EOF</userinput></screen>
-
       <para>When booting the new LFS system, if any events are missed, a warning
       message will appear and a <filename>/dev/bugreport</filename> file will be
       created. The warning message will tell you where to send feedback.</para>
@@ -178,8 +180,8 @@ EOF</userinput></screen>
 
       <seglistitem>
         <seg>ata_id, cdrom_id, create_floppy_devices, edd_id, firmware_helper,
-        scsi_id, udevcontrol, udevd, udevinfo, udevmonitor, udevtest, usb_id
-        and vol_id</seg>
+        path_id, scsi_id, udevcontrol, udevd, udevinfo, udevmonitor, udevsettle,
+        udevtest, udevtrigger, usb_id, vol_id, and write_cd_aliases</seg>
         <seg>/etc/udev</seg>
       </seglistitem>
     </segmentedlist>
@@ -241,6 +243,17 @@ EOF</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="path_id">
+        <term><command>path_id</command></term>
+        <listitem>
+          <para>Provide the shortest possible unique hardware path to a
+          device</para>
+          <indexterm zone="ch-system-udev path_id">
+            <primary sortas="b-path_id">path_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="scsi_id">
         <term><command>scsi_id</command></term>
         <listitem>
@@ -301,6 +314,17 @@ EOF</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="udevsettle">
+        <term><command>udevsettle</command></term>
+        <listitem>
+          <para>Watches the Udev event queue and exits if all current uevents
+          have been handled</para>
+          <indexterm zone="ch-system-udev udevsettle">
+            <primary sortas="b-udevsettle">udevsettle</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="udevtest">
         <term><command>udevtest</command></term>
         <listitem>
@@ -313,6 +337,16 @@ EOF</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="udevtrigger">
+        <term><command>udevtrigger</command></term>
+        <listitem>
+          <para>Triggers kernel device uevents to be replayed</para>
+          <indexterm zone="ch-system-udev udevtrigger">
+            <primary sortas="b-udevtrigger">udevtrigger</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="usb_id">
         <term><command>usb_id</command></term>
         <listitem>
diff --git a/general.ent b/general.ent
index a9425df43..d03c5fe4c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060427">
-<!ENTITY releasedate "April 27, 2006">
+<!ENTITY version "SVN-20060501">
+<!ENTITY releasedate "May 1, 2006">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
@@ -59,7 +59,7 @@
 <!ENTITY iproute2-version "2.6.16-060323">
 <!ENTITY kbd-version "1.12">
 <!ENTITY less-version "394">
-<!ENTITY lfs-bootscripts-version "20060415">
+<!ENTITY lfs-bootscripts-version "20060417">
 <!ENTITY libtool-version "1.5.22">
 <!ENTITY linux-version "2.6.16.5">
 <!ENTITY linux-dl-version "2.6">
@@ -84,8 +84,8 @@
 <!ENTITY tar-version "1.15.1">
 <!ENTITY tcl-version "8.4.12">
 <!ENTITY texinfo-version "4.8">
-<!ENTITY udev-version "088">
-<!ENTITY udev-config-file "udev-config-6.rules">
+<!ENTITY udev-version "091">
+<!ENTITY udev-config "udev-config-20060430">
 <!ENTITY util-linux-version "2.12r">
 <!ENTITY vim-version "6.4">
 <!ENTITY zlib-version "1.2.3">