aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter03/patches.xml23
-rw-r--r--chapter06/hotplug.xml52
3 files changed, 4 insertions, 76 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 461bfd472..9b0685d7c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -56,8 +56,6 @@ first a summary, then a detailed log.</para>
<listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem>
<listitem><para>gcc-3.4.2-linkonce-1.patch</para></listitem>
<listitem><para>hotplug-2004_09_20</para></listitem>
-<listitem><para>hotplug-2004_09_20-bogus_deps-1.patch</para></listitem>
-<listitem><para>hotplug-2004_09_20-device-2.patch</para></listitem>
<listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem>
<listitem><para>iproute2-2.6.8-040823</para></listitem>
<listitem><para>iproute2-2.6.8-040823-remove_db-1.patch</para></listitem>
@@ -95,6 +93,9 @@ first a summary, then a detailed log.</para>
</itemizedlist>
</listitem>
+<listitem><para>September 22nd, 2004 [jeremy]: Dropped the 2 patches to hotplug
+since they are no longer needed.</para></listitem>
+
<listitem><para>September 21st, 2004 [jeremy]: Upgraded to Util-linux-2.12e,
Udev-032, and Hotplug-2004_09_20. Thanks to David Jensen and Kevin Fleming
for their hard work in putting together the new udev instructions, including
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index d05cc7a17..50a8d64f8 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -72,29 +72,6 @@ following:</para>
</varlistentry>
<varlistentry>
-<term>Hotplug Bogus Dependencies Patch- 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;hotplug-&hotplug-version;-bogus_deps-1.patch"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Hotplug Fix for USB Coldplugging - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;hotplug-&hotplug-version;-device-2.patch"/></para>
-</listitem>
-</varlistentry>
-
-<!--
-<varlistentry>
-<term>Hotplug ISAPNP Coldplugging Patch - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;hotplug-&hotplug-version;-isapnp-2.patch"/></para>
-</listitem>
-</varlistentry>
--->
-
-<varlistentry>
<term>Inetutils Kernel Headers Patch - 1 KB:</term>
<listitem>
<para><ulink url="&patches-root;inetutils-&inetutils-version;-kernel_headers-1.patch"/></para>
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index dccc2cf3f..a702f43a0 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -28,35 +28,7 @@ boot and inserts the relevant modules into the running kernel.
<sect2 role="installation">
<title>Installation of Hotplug</title>
-<para>
-The <command>usb.rc</command> script provided by the
-<application>Hotplug</application> package depends on the programs
-<command>usbutils</command> and <command>which</command> being present.
-However, these programs are not called for any useful purpose.
-Apply the patch that removes those dependencies:
-</para>
-
-<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-bogus_deps-1.patch</userinput></screen>
-
-<para>
-USB coldplugging is somewhat broken in <application>Hotplug</application>
-by default: the DEVICE environment variable is not passed to user-defined USB
-hotplug handlers. Fix this with the following patch:
-</para>
-
-<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-device-2.patch</userinput></screen>
-
-<!-- Waiting for hotplug-2004_04_01-isapnp-4.patch
-<para>
-There is an optional patch that adds ISAPNP hardware detection
-capabilities to Hotplug. It is not well tested and in fact contains known
-bugs. If you chose to apply it, run the following command:
-</para>
-
-<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-isapnp-2.patch</userinput></screen>
--->
-
-<para>Now install the Hotplug package:</para>
+<para>Install the Hotplug package:</para>
<screen><userinput>make install</userinput></screen>
@@ -69,28 +41,6 @@ the script including with LFS-Bootscripts:</para>
that reason, remove the network hotplug agent:</para>
<screen><userinput>rm -f /etc/hotplug/net.agent</userinput></screen>
-<!-- Will be useless with version 4 of the isapnp patch
-<para>
-If you have applied the ISAPNP patch, add some required entries to
-<filename>/etc/modprobe.conf</filename>:</para>
-
-<screen><userinput>cat &gt;&gt;/etc/modprobe.conf &lt;&lt;"EOF"
-# Begin /etc/modprobe.conf entries for ISAPNP hardware detection script
-# by Marco d'Itri
-alias pnp:dPNP0511 irtty-sir
-alias pnp:dPNP0700 floppy
-alias pnp:dPNP0800 pcspkr
-alias pnp:dPNP0B00 rtc
-alias pnp:dPNP0303 atkbd
-alias pnp:dPNP0F13 psmouse
-alias pnp:dPNPB02F analog
-# End /etc/modprobe.conf entries for ISAPNP hardware detection script
-EOF</userinput></screen>
-
-<para>These entries may not be needed in newer versions of the Linux kernel,
-since Marco d'Itri will try to convince developers to put them into the
-corresponding modules themselves.</para>
--->
</sect2>