Translate r11432

Make symbolic links in inital part of Chapter 6 consistent
for all versions of the book.  Allows removing environment
variables no longer needed with e2fsprogs.

chapter01/changelog.xml

@@ -41,6 +41,18 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2018-07-03</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] -
+           使得第 6 章开头创建的环境变量在本书的两个版本中一致，
+           即可移除 e2fsprogs 中不再必要的环境变量。
+           </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-07-03</para>
       <itemizedlist>

chapter06/createfiles.xml

@@ -42,15 +42,20 @@
 	  为了满足它们的要求，需要创建一些符号链接。在本章的后续内容中，
 	  它们将被安装好的软件包中真正的文件替代：</para>
 
+<!--
 <screen revision="sysv"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
 ln -sv /tools/bin/{install,perl} /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-ln -sv bash /bin/sh</userinput></screen>
+ln -sv bash /bin/sh
+
 
+</userinput></screen>
+-->
 <!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la -->
 
-<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
+<!--<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin-->
+<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
 ln -sv /tools/bin/{env,install,perl} /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
@@ -191,13 +196,11 @@ ln -sv bash /bin/sh</userinput></screen>
       </listitem>
     </varlistentry>
 -->
-    <varlistentry revision="systemd">
+    <!--<varlistentry revision="systemd">-->
+    <varlistentry>
       <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
       <listitem>
-        <!--para>These links prevent systemd utilities from acquiring an
-        unnecessary reference to the
-        <filename class="directory">/tools</filename> directory.</para-->
-        <para>这些链接防止 systemd 工具获得指向
+        <para>这些链接防止一些工具获得指向
 			<filename class="directory">/tools</filename>
 			目录的不必要的引用。</para>
       </listitem>

chapter06/e2fsprogs.xml

@@ -50,10 +50,12 @@ cd build</userinput></screen>
 
     <para>准备安装 E2fsprogs：</para>
 
-<screen><userinput remap="configure">LIBS=-L/tools/lib                    \
+<!--<screen><userinput remap="configure">LIBS=-L/tools/lib                    \
+CFLAGS=-I/tools/include              \
 CFLAGS=-I/tools/include              \
 PKG_CONFIG_PATH=/tools/lib/pkgconfig \
-../configure --prefix=/usr           \
+../configure - -prefix=/usr           \-->
+<screen><userinput remap="configure">../configure --prefix=/usr           \
              --bindir=/bin           \
              --with-root-prefix=""   \
              --enable-elf-shlibs     \
@@ -64,6 +66,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
 
     <variablelist>
       <title>环境变量和配置选项的含义：</title>
+<!--
       <varlistentry>
         <term><parameter>PKG_CONFIG_PATH, LIBS, CFLAGS</parameter></term>
         <listitem>
@@ -71,7 +74,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
           <xref linkend="ch-tools-util-linux"/> 软件包。</para>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry>
         <term><parameter>--with-root-prefix=""</parameter> 和
               <parameter>--bindir=/bin</parameter></term>

general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180703">
+<!ENTITY version         "SVN-20180706">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20180703-systemd">
+<!ENTITY versiond        "20180706-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "2018 年 7 月 3 日">
+<!ENTITY releasedate     "2018 年 7 月 6 日">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">