Changeset bad0dd1

Timestamp:

05/20/2004 04:21:42 PM (20 years ago)

Author:

Zack Winkles <winkie@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.0, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

678e79c

Parents:

69a7501b

Message:

Cleaned up hotplug installation a bit

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

Files:

• chapter01/changelog.xml (modified) (3 diffs)
• chapter03/patches.xml (modified) (3 diffs)
• chapter06/hotplug.xml (modified) (5 diffs)
• chapter07/bootscripts.xml (modified) (1 diff)

chapter01/changelog.xml

@@ -58 +58 @@
 <listitem><para>coreutils-5.2.1-dupes-1.patch</para></listitem>
 <listitem><para>flex-2.5.31-debian-fixes-2.patch</para></listitem>
+<listitem><para>hotplug-2004_04_01</para></listitem>
+<listitem><para>hotplug-2004_04_01-bogus-deps-1.patch</para></listitem>
+<listitem><para>hotplug-2004_04_01-device-2.patch</para></listitem>
+<listitem><para>hotplug-2004_04_01-isapnp-2.patch</para></listitem>
 <listitem><para>iana-etc-1.00</para></listitem>
 <listitem><para>inetutils-1.4.2-kernel-headers-1.patch</para></listitem>
@@ -73 +77 @@
 <listitem><para>udev-025-config-2.patch</para></listitem>
 <listitem><para>util-linux-2.12a-kernel-headers-1.patch</para></listitem>
-<listitem><para>hotplug-2004_04_01</para></listitem>
 </itemizedlist>
 </listitem>
@@ -100 +103 @@
 </listitem>
 
+<listitem><para>May 20th, 2004 [winkie]: Dropped Hotplug's
+<quote>cosmetic</quote> patch in favor of the script from LFS-Bootscripts and
+some general textual/rendering cleanups.</para></listitem>
+
 <listitem><para>May 20th, 2004 [winkie]: Point to the correct GCC patches.
 </para></listitem>

chapter03/patches.xml

@@ -65 +65 @@
 
 <varlistentry>
-<term>Hotplug patch that eliminates bogus dependencies - 1 KB:</term>
+<term>Hotplug Bogus Dependencies Patch- 1 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;hotplug-&hotplug-version;-bogus-deps-1.patch"/></para>
@@ -72 +72 @@
 
 <varlistentry>
-<term>Hotplug patch that makes the initscript consistent with the rest - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;hotplug-&hotplug-version;-cosmetic-2.patch"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Hotplug patch that fixes USB cold plugging - 1 KB:</term>
+<term>Hotplug Fix for USB Coldplugging - 1 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;hotplug-&hotplug-version;-device-2.patch"/></para>
@@ -86 +79 @@
 
 <varlistentry>
-<term>Hotplug patch that adds ISAPNP hardware detection (optional) - 1 KB:</term>
+<term>Hotplug ISAPNP Coldplugging Patch - 1 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;hotplug-&hotplug-version;-isapnp-2.patch"/></para>

chapter06/hotplug.xml

@@ -4 +4 @@
   %general-entities;
 ]>
-<sect1 id="ch-system-hotplug" role="wrap">
+<sect1 id="ch-system-hotplug" xreflabel="Hotplug" role="wrap">
 <title>Hotplug-&hotplug-version;</title>
 <?dbhtml filename="hotplug.html"?>
@@ -29 +29 @@
 
 <para>
-By default, Hotplug does not output anything in its initscript and places it
-into
-<filename class="directory">/etc/init.d</filename>,
-whereas the place for initscripts in LFS is
-<filename class="directory">/etc/rc.d/init.d</filename>. Apply the patch
-that makes the output of hotplug initscript more verbose and places this
-initscript into the proper directory:
-</para>
-
-<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-cosmetic-2.patch
-</userinput></screen>
-
-<para>
 Apply the patch that avoids bogus dependencies of the hotplug initscript
 upon <application>which</application> and
@@ -47 +34 @@
 </para>
 
-<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-bogus-deps-1.patch
-</userinput></screen>
+<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-bogus-deps-1.patch</userinput></screen>
 
 <para>
@@ -55 +41 @@
 </para>
 
-<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-device-2.patch
-</userinput></screen>
+<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-device-2.patch</userinput></screen>
 
 <para>
@@ -72 +57 @@
 <screen><userinput>make install</userinput></screen>
 
-<para>Make a symbolic link that tells the lfs-bootscripts package to run the
-hotplug initscript after mounting and cleaning filesystems:</para>
+<para>Remove hotplug's not-so-clean init script, since we're going to be using
+the script including with LFS-Bootscripts:</para>
 
-<screen><userinput>ln -sf ../init.d/hotplug /etc/rc.d/init.d/S55hotplug</userinput></screen>
+<screen><userinput>rm -rf /etc/init.d</userinput></screen>
 
 <para>

chapter07/bootscripts.xml

@@ -32 +32 @@
 <screen><userinput>make install</userinput></screen>
 
+<para>Also install hotplug's boot script:</para>
+
+<screen><userinput>make install-hotplug</userinput></screen>
+
 </sect2>