From 84ba73a7b604f4762e42023416162c4e40afa97b Mon Sep 17 00:00:00 2001 From: Jeremy Utley Date: Thu, 23 Sep 2004 17:48:20 +0000 Subject: [PATCH] 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 --- chapter01/changelog.xml | 4 ++++ chapter06/hotplug.xml | 6 ++++++ chapter06/util-linux.xml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 39ecbc859..dfeb25f8f 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -93,6 +93,10 @@ first a summary, then a detailed log. +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. + September 23nd, 2004 [jim]: Changed patch for util-linux. Updated patch fixes sfdisk in the sfdisk code. 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. Installation of Hotplug +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: + +sed -i "s/|| return 0/|| exit 0/g" etc/hotplug/isapnp.rc + Install the Hotplug package: make install 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 default optimisation level is used. The following patch prevents the problematic optimisation pass from being used. -patch -Np1 -i ../util-linux-&util-linux-version;-sfdisk-1.patch +patch -Np1 -i ../util-linux-&util-linux-version;-sfdisk-2.patch Prepare Util-linux for compilation: