aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nichilson <dnicholson@linuxfromscratch.org>2007-08-11 17:08:38 +0000
committerDan Nichilson <dnicholson@linuxfromscratch.org>2007-08-11 17:08:38 +0000
commit821470c373ebd37c4916908ea7bdcc3de08d040a (patch)
treeea527fa21f611367aa2ff78a5ae10e3388f2dbc8
parent097e7d2e742c6c01b7367e64d74da236a3ac6629 (diff)
Merge r8309 from trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.3/BOOK@8310 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml7
-rw-r--r--chapter06/bash.xml9
-rw-r--r--general.ent2
3 files changed, 11 insertions, 7 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0f8b3046c..6812b0b8b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,16 +36,19 @@
</listitem>
-->
-
<listitem>
<para>2007-08-11</para>
<itemizedlist>
<listitem>
+ <para>[dnicholson] - Changed the Bash testsuite standard input fix
+ to only affect the necessary test script.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Created LFS 6.3-rc-2..</para>
</listitem>
<listitem>
<para>[bdubbs] - Upgrade to Linux-2.6.22.1, fixes
- <ulink url="&lfs-ticket-root;2044">#2059</ulink>.</para>
+ <ulink url="&lfs-ticket-root;2044">#2059</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 56d077a22..a6a694b86 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -75,16 +75,17 @@ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
<para>To prepare the tests, ensure that the locale
setting from our environment will be used and that the <systemitem
- class="username">nobody</systemitem> user can write to the sources tree:</para>
+ class="username">nobody</systemitem> user can read the standard input
+ device and write to the sources tree:</para>
<screen><userinput>sed -i 's/LANG/LC_ALL/' tests/intl.tests
+sed -i 's@tests@&amp; &lt;/dev/tty@' tests/run-test
chown -Rv nobody ./</userinput></screen>
<para>Now, run the tests as the <systemitem
- class="username">nobody</systemitem> user, ensuring that the standard
- input device is readable:</para>
+ class="username">nobody</systemitem> user:</para>
-<screen><userinput>su-tools nobody -s /bin/bash -c "make tests" &lt;/dev/tty</userinput></screen>
+<screen><userinput>su-tools nobody -s /bin/bash -c "make tests"</userinput></screen>
<para>Install the package:</para>
diff --git a/general.ent b/general.ent
index fe4cb69c1..998233521 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "6.3-rc2">
+<!ENTITY version "6.3-20070811">
<!ENTITY releasedate "August 11, 2007">
<!ENTITY milestone "6.3">
<!ENTITY generic-version "6.3-branch"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->