Browse Source

Added a sed to fix hotplug's syntax error in isapnp.rc, also completed Jim's integration of the new util-linux patch.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4198 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Jeremy Utley 21 years ago
parent
commit
84ba73a7b6
3 changed files with 11 additions and 1 deletions
  1. 4 0
      chapter01/changelog.xml
  2. 6 0
      chapter06/hotplug.xml
  3. 1 1
      chapter06/util-linux.xml

+ 4 - 0
chapter01/changelog.xml

@@ -93,6 +93,10 @@ first a summary, then a detailed log.</para>
 </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>
 

+ 6 - 0
chapter06/hotplug.xml

@@ -28,6 +28,12 @@ boot and inserts the relevant modules into the running kernel.
 <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>

+ 1 - 1
chapter06/util-linux.xml

@@ -47,7 +47,7 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 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>