cvs commit: LFS/BOOK/chapter07 bootscripts.xml

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Thu May 20 09:21:42 PDT 2004


winkie      04/05/20 10:21:42

  Modified:    BOOK/chapter01 changelog.xml
               BOOK/chapter03 patches.xml
               BOOK/chapter06 hotplug.xml
               BOOK/chapter07 bootscripts.xml
  Log:
  Cleaned up hotplug installation a bit
  
  Revision  Changes    Path
  1.773     +8 -1      LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.772
  retrieving revision 1.773
  diff -u -r1.772 -r1.773
  --- changelog.xml	20 May 2004 15:59:09 -0000	1.772
  +++ changelog.xml	20 May 2004 16:21:42 -0000	1.773
  @@ -57,6 +57,10 @@
   <itemizedlist>
   <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>
   <listitem><para>inetutils-1.4.2-no-server-man-pages-1.patch</para></listitem>
  @@ -72,7 +76,6 @@
   <listitem><para>udev-025</para></listitem>
   <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>
    
  @@ -98,6 +101,10 @@
   <listitem><para>zlib-1.1.4-vsnprintf.patch</para></listitem>
   </itemizedlist>
   </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>
  
  
  
  1.13      +3 -10     LFS/BOOK/chapter03/patches.xml
  
  Index: patches.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/patches.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- patches.xml	20 May 2004 15:59:09 -0000	1.12
  +++ patches.xml	20 May 2004 16:21:42 -0000	1.13
  @@ -64,28 +64,21 @@
   </varlistentry>
   
   <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>
   </listitem>
   </varlistentry>
   
   <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>
   </listitem>
   </varlistentry>
   
   <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>
   </listitem>
  
  
  
  1.2       +6 -21     LFS/BOOK/chapter06/hotplug.xml
  
  Index: hotplug.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/hotplug.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hotplug.xml	20 May 2004 01:47:22 -0000	1.1
  +++ hotplug.xml	20 May 2004 16:21:42 -0000	1.2
  @@ -3,7 +3,7 @@
     <!ENTITY % general-entities SYSTEM "../general.ent">
     %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"?>
   
  @@ -28,34 +28,19 @@
   <title>Installation of Hotplug</title>
   
   <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
   <application>usbutils</application> packages:
   </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>
   USB coldplugging is somewhat broken in Hotplug by default. Fix this with the
   following patch:
   </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>
   At last, there is an optional patch that adds ISAPNP hardware detection
  @@ -71,10 +56,10 @@
   
   <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>
   If you have applied the ISAPNP patch, add some required entries to
  
  
  
  1.11      +4 -0      LFS/BOOK/chapter07/bootscripts.xml
  
  Index: bootscripts.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter07/bootscripts.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- bootscripts.xml	17 May 2004 21:55:01 -0000	1.10
  +++ bootscripts.xml	20 May 2004 16:21:42 -0000	1.11
  @@ -31,6 +31,10 @@
   
   <screen><userinput>make install</userinput></screen>
   
  +<para>Also install hotplug's boot script:</para>
  +
  +<screen><userinput>make install-hotplug</userinput></screen>
  +
   </sect2>
   
   
  
  
  



More information about the lfs-book mailing list