From 18da154b58d7b8f24bb15846b2d96ec4dbab0fc1 Mon Sep 17 00:00:00 2001
From: Zack Winkles <winkie@linuxfromscratch.org>
Date: Tue, 15 Jun 2004 19:28:46 +0000
Subject: [PATCH] Dropped the Udev patch in favor of separate configuration
 files Properly recreate /etc/hotplug.d/default/udev.hotplug

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3796 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  8 +++++++-
 chapter03/packages.xml  | 15 ++++++++++++++-
 chapter03/patches.xml   |  7 -------
 chapter05/udev.xml      | 17 ++++++-----------
 chapter06/udev.xml      | 21 ++++++++++++---------
 5 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9dd95fd43..6f8d51ee6 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -57,7 +57,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>sysklogd-1.4.1-signal-1.patch</para></listitem>
 <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
 <listitem><para>udev-027</para></listitem>
-<listitem><para>udev-027-config-1.patch</para></listitem>
+<listitem><para>udev-config-1.permissions</para></listitem>
 <listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
 <listitem><para>vim-6.3 language files</para></listitem>
 </itemizedlist>
@@ -76,6 +76,12 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 15, 2004 [winkie]: Recreate Udev's entry in /etc/hotplug.d,
+since it's not correct for our purposes by default.</para></listitem>
+
+<listitem><para>June 15, 2004 [winkie]: Dropped the Udev patch in favor copying
+the configuration file(s) to /etc/udev after installation.</para></listitem>
+
 <listitem><para>June 15, 2004 [winkie]: Upgraded to Sed 4.1.</para></listitem>
 
 <listitem><para>June 15, 2004 [winkie]: Upgraded to Udev 027.</para></listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index e2f7b2d46..fa8ad6834 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -375,6 +375,20 @@
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Udev Permissions Configuration - 2 KB:</term>
+<listitem>
+<para><ulink url="http://downloads.linuxfromscratch.org/udev-config-1.permissions"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Udev Rules Configuration - 1 KB:</term>
+<listitem>
+<para><ulink url="http://downloads.linuxfromscratch.org/udev-config-1.rules"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>Util-linux (&util-linux-version;) - 1,814 KB:</term>
 <listitem>
@@ -396,7 +410,6 @@
 </listitem>
 </varlistentry>
 
-
 <varlistentry>
 <term>Zlib (&zlib-version;) - 277 KB:</term>
 <listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 47e4c8dca..56fd738ef 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -160,13 +160,6 @@ url="&patches-root;linux-&linux-version;-fpu-1.patch"/></para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>Udev Configuration Patch - 6 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;udev-&udev-version;-config-1.patch"/></para>
-</listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Util-Linux Kernel Headers Patch - 3 KB:</term>
 <listitem>
diff --git a/chapter05/udev.xml b/chapter05/udev.xml
index c532cc8e2..1d24b4a45 100644
--- a/chapter05/udev.xml
+++ b/chapter05/udev.xml
@@ -31,13 +31,6 @@
 <sect2 role="installation">
 <title>Installation of Udev</title>
 
-<para>By default, the permissions udev assigns to nodes are all uniform,
-being owned by user root, group root, and only accessible to root. As you
-can easily imagine, this isn't ideal. Give it a much better configuration
-by applying the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../udev-&udev-version;-config-1.patch</userinput></screen>
-
 <para>The udevstart program hardcodes the path to the udev program in itself,
 which is bad since we install udev in a non-standard location. Fix this by
 running the following:</para>
@@ -53,13 +46,15 @@ configuration files:</para>
 
 <screen><userinput>make prefix=/tools etcdir=/tools/etc</userinput></screen>
 
-<para>Generate Udev's main configuration file:</para>
+<para>Install it:</para>
 
-<screen><userinput>make udevdir=/dev etc/udev/udev.conf</userinput></screen>
+<screen><userinput>make DESTDIR=/tools udevdir=/dev install</userinput></screen>
 
-<para>Finally, install it:</para>
+<para>Udev's configuration is far from ideal by default, so we install our own
+configuration files here:</para>
 
-<screen><userinput>make DESTDIR=/tools install</userinput></screen>
+<screen><userinput>cp ../udev-config-1.permissions /tools/etc/udev/permissions.d/00-lfs.permissions
+cp ../udev-config-1.rules /tools/etc/udev/rules.d/00-lfs.rules</userinput></screen>
 
 </sect2>
 
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index b9c124cde..e80e5b306 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -22,21 +22,24 @@
 <sect2 role="installation">
 <title>Installation of Udev</title>
 
-<para>By default, the permissions udev assigns to nodes are all uniform,
-being owned by user root, group root, and only accessible to root. As you
-can easily imagine, this isn't ideal. Give it a much better configuration
-by applying the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../udev-&udev-version;-config-1.patch</userinput></screen>
-
-<para>Now compile Udev:</para>
+<para>First compile Udev:</para>
 
 <screen><userinput>make udevdir=/dev</userinput></screen>
 
-<para>Finally, install it:</para>
+<para>Install it:</para>
 
 <screen><userinput>make udevdir=/dev install</userinput></screen>
 
+<para>Ensure that Hotplug addresses Udev correctly:</para>
+
+<screen><userinput>ln -sf /sbin/udev /etc/hotplug.d/default/udev.hotplug</userinput></screen>
+
+<para>Udev's configuration is far from ideal by default, so we install our own
+configuration files here:</para>
+
+<screen><userinput>cp ../udev-config-1.permissions /etc/udev/permissions.d/00-lfs.permissions
+cp ../udev-config-1.rules /etc/udev/rules.d/00-lfs.rules</userinput></screen>
+
 </sect2>