From 84ba73a7b604f4762e42023416162c4e40afa97b Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Thu, 23 Sep 2004 17:48:20 +0000
Subject: 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
---
 chapter06/hotplug.xml    | 6 ++++++
 chapter06/util-linux.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'chapter06')

diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index a702f43a0..620ca9fe2 100644
--- a/chapter06/hotplug.xml
+++ b/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>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index b16becd71..4c1ecf2db 100644
--- a/chapter06/util-linux.xml
+++ b/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>
 
-- 
cgit v1.2.3-54-g00ecf