r4198 - in trunk/BOOK: chapter01 chapter06

jeremy at linuxfromscratch.org jeremy at linuxfromscratch.org
Thu Sep 23 10:48:22 PDT 2004


Author: jeremy
Date: 2004-09-23 11:48:20 -0600 (Thu, 23 Sep 2004)
New Revision: 4198

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter06/hotplug.xml
   trunk/BOOK/chapter06/util-linux.xml
Log:
Added a sed to fix hotplug's syntax error in isapnp.rc, also completed Jim's integration of the new util-linux patch.

Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml	2004-09-23 17:16:17 UTC (rev 4197)
+++ trunk/BOOK/chapter01/changelog.xml	2004-09-23 17:48:20 UTC (rev 4198)
@@ -93,6 +93,10 @@
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 23rd, 2004 [jeremy]: Added a sed to hotplug to fix
+the return 0 syntax error in isapnp.rc.  Assistance on this courtesy of Chris
+Lingard and Alexander Patrakov.</para></listitem>
+
 <listitem><para>September 23nd, 2004 [jim]: Changed patch for util-linux.
 Updated patch fixes sfdisk in the sfdisk code.</para></listitem>
 

Modified: trunk/BOOK/chapter06/hotplug.xml
===================================================================
--- trunk/BOOK/chapter06/hotplug.xml	2004-09-23 17:16:17 UTC (rev 4197)
+++ trunk/BOOK/chapter06/hotplug.xml	2004-09-23 17:48:20 UTC (rev 4198)
@@ -28,6 +28,12 @@
 <sect2 role="installation">
 <title>Installation of Hotplug</title>
 
+<para>The isapnp.rc script included with hotplug has a minor syntax error,
+using return 0 outside a function definition where exit 0 should be used.
+The following command fixes this:</para>
+
+<screen><userinput>sed -i "s/|| return 0/|| exit 0/g" etc/hotplug/isapnp.rc</userinput></screen>
+
 <para>Install the Hotplug package:</para>
 
 <screen><userinput>make install</userinput></screen>

Modified: trunk/BOOK/chapter06/util-linux.xml
===================================================================
--- trunk/BOOK/chapter06/util-linux.xml	2004-09-23 17:16:17 UTC (rev 4197)
+++ trunk/BOOK/chapter06/util-linux.xml	2004-09-23 17:48:20 UTC (rev 4198)
@@ -47,7 +47,7 @@
 default optimisation level is used.  The following patch prevents the
 problematic optimisation pass from being used.</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-sfdisk-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-sfdisk-2.patch</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
 




More information about the lfs-book mailing list