Bläddra i källkod

Update to upstream r11882

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11883 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Pierre Labastie 5 år sedan
förälder
incheckning
264dfd9e05
5 ändrade filer med 20 tillägg och 6 borttagningar
  1. 12 0
      chapter01/changelog.xml
  2. 1 1
      chapter05/createfiles.xml
  3. 3 1
      chapter06/bash.xml
  4. 1 1
      chapter06/coreutils.xml
  5. 3 3
      general.ent

+ 12 - 0
chapter01/changelog.xml

@@ -42,6 +42,18 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     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 &lt;&lt; EOF, and
+          explicitely defining stdin (with help from thomas and bdubbs).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2020-05-29</para>
       <itemizedlist>

+ 1 - 1
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" &gt;&gt; /etc/passwd
+<screen><userinput>echo "tester:x:$(ls -n $(tty) | cut -d" " -f3):101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
 echo "tester:x:101:" &gt;&gt; /etc/group
 install -o tester -d /home/tester</userinput></screen>
 

+ 3 - 1
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 &lt;&lt; EOF
+PATH=$PATH make tests &lt; $(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

+ 1 - 1
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" &gt;&gt; /etc/group</userinput></screen>
+<screen><userinput remap="test">echo "dummy:x:102:tester" &gt;&gt; /etc/group</userinput></screen>
 
     <para>Fix some of the permissions so that the non-root user can compile and
     run the tests:</para>

+ 3 - 3
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 &ndash; -->