diff options
| author | Pierre Labastie <pieere@linuxfromscratch.org> | 2020-05-31 20:01:42 +0000 |
|---|---|---|
| committer | Pierre Labastie <pieere@linuxfromscratch.org> | 2020-05-31 20:01:42 +0000 |
| commit | 264dfd9e05b9595d78642119c9cf43eee5558084 (patch) | |
| tree | b68069365982691375e3c8030f69b9ba500bcdf3 | |
| parent | ae7f075dd6185f9ec93d5aedbb46e98511f25235 (diff) | |
Update to upstream r11882
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11883 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter05/createfiles.xml | 2 | ||||
| -rw-r--r-- | chapter06/bash.xml | 4 | ||||
| -rw-r--r-- | chapter06/coreutils.xml | 2 | ||||
| -rw-r--r-- | general.ent | 6 |
5 files changed, 20 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index f0f45fc81..b577d0b47 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,18 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem> + <para>2020-05-31</para> + <itemizedlist> + <listitem> + <para>[pierre] - Fix bash tests: add a couple of symlinks + from /bin to /tools, create the tester user with the uid of + the tty owner, run the bash tests with su << EOF, and + explicitely defining stdin (with help from thomas and bdubbs).</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2020-05-29</para> <itemizedlist> <listitem> diff --git a/chapter05/createfiles.xml b/chapter05/createfiles.xml index ce1f67ba7..aed8d79da 100644 --- a/chapter05/createfiles.xml +++ b/chapter05/createfiles.xml @@ -160,7 +160,7 @@ EOF</userinput></screen> user. We add this user here and delete this account at the end of that chapter.</para> -<screen><userinput>echo "tester:x:101:101::/home/tester:/bin/bash" >> /etc/passwd +<screen><userinput>echo "tester:x:$(ls -n $(tty) | cut -d" " -f3):101::/home/tester:/bin/bash" >> /etc/passwd echo "tester:x:101:" >> /etc/group install -o tester -d /home/tester</userinput></screen> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index ae42cf4cb..4d06fc2a3 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -80,7 +80,9 @@ <para>Now, run the tests as the <systemitem class="username">tester</systemitem> user:</para> -<screen><userinput remap="test">su tester -c "PATH=$PATH make tests"</userinput></screen> +<screen><userinput remap="test">su tester << EOF +PATH=$PATH make tests < $(tty) +EOF</userinput></screen> <para>The <systemitem class="username">tester</systemitem> user does not have enough permissions for all the tests to pass. This shows diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 6a12d4e80..5a4079d78 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -116,7 +116,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ these tests are not skipped we'll add a temporary group and make the user <systemitem class="username">tester</systemitem> a part of it:</para> -<screen><userinput remap="test">echo "dummy:x:1000:tester" >> /etc/group</userinput></screen> +<screen><userinput remap="test">echo "dummy:x:102:tester" >> /etc/group</userinput></screen> <para>Fix some of the permissions so that the non-root user can compile and run the tests:</para> diff --git a/general.ent b/general.ent index d6ec5a6b5..2e518c356 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "20200529-cross-chap5"> +<!ENTITY version "20200531-cross-chap5"> <!ENTITY short-version "svn"> <!-- Used below in &blfs-book; Change to x.y for release but not -rc releases --> <!ENTITY generic-version "cross-chap5"> <!-- Use "development" or "x.y[-pre{x}]" --> -<!ENTITY versiond "20200529-cross-cp5-systemd"> +<!ENTITY versiond "20200531-cross-cp5-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "May 29th, 2020"> +<!ENTITY releasedate "May 31st, 2020"> <!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not – --> |