From bad0dd14d9c40126fe3755c667e25ef2acc57563 Mon Sep 17 00:00:00 2001 From: Zack Winkles Date: Thu, 20 May 2004 16:21:42 +0000 Subject: [PATCH] Cleaned up hotplug installation a bit git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3678 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 9 ++++++++- chapter03/patches.xml | 13 +++---------- chapter06/hotplug.xml | 27 ++++++--------------------- chapter07/bootscripts.xml | 4 ++++ 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c8d6d87c8..5ca23becb 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -57,6 +57,10 @@ first a summary, then a detailed log. coreutils-5.2.1-dupes-1.patch flex-2.5.31-debian-fixes-2.patch +hotplug-2004_04_01 +hotplug-2004_04_01-bogus-deps-1.patch +hotplug-2004_04_01-device-2.patch +hotplug-2004_04_01-isapnp-2.patch iana-etc-1.00 inetutils-1.4.2-kernel-headers-1.patch inetutils-1.4.2-no-server-man-pages-1.patch @@ -72,7 +76,6 @@ first a summary, then a detailed log. udev-025 udev-025-config-2.patch util-linux-2.12a-kernel-headers-1.patch -hotplug-2004_04_01 @@ -99,6 +102,10 @@ first a summary, then a detailed log. +May 20th, 2004 [winkie]: Dropped Hotplug's +cosmetic patch in favor of the script from LFS-Bootscripts and +some general textual/rendering cleanups. + May 20th, 2004 [winkie]: Point to the correct GCC patches. diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 5e6fe72bd..035f0b8c8 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -64,28 +64,21 @@ following: -Hotplug patch that eliminates bogus dependencies - 1 KB: +Hotplug Bogus Dependencies Patch- 1 KB: -Hotplug patch that makes the initscript consistent with the rest - 1 KB: - - - - - - -Hotplug patch that fixes USB cold plugging - 1 KB: +Hotplug Fix for USB Coldplugging - 1 KB: -Hotplug patch that adds ISAPNP hardware detection (optional) - 1 KB: +Hotplug ISAPNP Coldplugging Patch - 1 KB: diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml index dcc704950..e1d544798 100644 --- a/chapter06/hotplug.xml +++ b/chapter06/hotplug.xml @@ -3,7 +3,7 @@ %general-entities; ]> - + Hotplug-&hotplug-version; @@ -27,35 +27,20 @@ modules into the running kernel. Installation of Hotplug - -By default, Hotplug does not output anything in its initscript and places it -into -/etc/init.d, -whereas the place for initscripts in LFS is -/etc/rc.d/init.d. Apply the patch -that makes the output of hotplug initscript more verbose and places this -initscript into the proper directory: - - -patch -Np1 -i ../hotplug-&hotplug-version;-cosmetic-2.patch - - Apply the patch that avoids bogus dependencies of the hotplug initscript upon which and usbutils packages: -patch -Np1 -i ../hotplug-&hotplug-version;-bogus-deps-1.patch - +patch -Np1 -i ../hotplug-&hotplug-version;-bogus-deps-1.patch USB coldplugging is somewhat broken in Hotplug by default. Fix this with the following patch: -patch -Np1 -i ../hotplug-&hotplug-version;-device-2.patch - +patch -Np1 -i ../hotplug-&hotplug-version;-device-2.patch At last, there is an optional patch that adds ISAPNP hardware detection @@ -71,10 +56,10 @@ run the following command: make install -Make a symbolic link that tells the lfs-bootscripts package to run the -hotplug initscript after mounting and cleaning filesystems: +Remove hotplug's not-so-clean init script, since we're going to be using +the script including with LFS-Bootscripts: -ln -sf ../init.d/hotplug /etc/rc.d/init.d/S55hotplug +rm -rf /etc/init.d If you have applied the ISAPNP patch, add some required entries to diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml index 6982e698d..fee55dbbe 100644 --- a/chapter07/bootscripts.xml +++ b/chapter07/bootscripts.xml @@ -31,6 +31,10 @@ make install +Also install hotplug's boot script: + +make install-hotplug +