aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter06/glibc.xml3
2 files changed, 6 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index cceca8b81..841f7b084 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,11 @@
<para>2009-05-23</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Shorten the command used to adjust the linker in
+ Chapter 6. Thanks to Chris Staub for the improvement. Fixes
+ <ulink url="&lfs-ticket-root;2404">#2404</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgrade to Shadow-4.1.4.1. Fixes
<ulink url="&lfs-ticket-root;2408">#2408</ulink>.</para>
</listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 4dc69b9a7..53c97a8ca 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -84,8 +84,7 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
test would be carried out against the wrong Glibc. We can force the script
to check the Glibc we have just installed with the following:</para>
-<screen><userinput remap="pre">DL=$(readelf -l /bin/sh | grep interpreter | \
-awk '{print $4}' | sed -e 's@/tools@@' -e 's@]$@@')
+<screen><userinput remap="pre">DL=$(readelf -l /bin/sh | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
sed -i &quot;s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|&quot; \
scripts/test-installation.pl
unset DL</userinput></screen>