Browse Source

Adapt the LFS book for new jhalfs.

The only visible change should be in "Static IP Configuration" for systemd,
where <network-device-name> is made <replaceable>, and so appears in
italics (note: this is not needed by jhalfs, but is consistent with
other similar constructs in the book).

was r11555.
Pierre Labastie 6 years ago
parent
commit
36823634f4
5 changed files with 12 additions and 9 deletions
  1. 1 1
      chapter07/clock.xml
  2. 3 1
      chapter07/consoled.xml
  3. 2 1
      chapter07/network.xml
  4. 3 2
      chapter07/networkd.xml
  5. 3 4
      chapter07/usage.xml

+ 1 - 1
chapter07/clock.xml

@@ -55,7 +55,7 @@
   <para>如果您的硬件时钟设置为本地时间,以下列内容创建
   	  <filename>/etc/adjtime</filename> 文件:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/adjtime &lt;&lt; "EOF"
+<screen><userinput>cat &gt; /etc/adjtime &lt;&lt; "EOF"
 <literal>0.0 0 0.0
 0
 LOCAL</literal>

+ 3 - 1
chapter07/consoled.xml

@@ -79,7 +79,9 @@
   </variablelist>
 
   <para>下面是使用德语键盘和控制台的例子:</para>
-
+<!-- This is what is used by jhalfs for creating the vconsole.conf file.
+     Whenever you want to change the following, please inform the jhalfs
+     maintianer(s). -->
 <screen role="nodump"><userinput>cat &gt; /etc/vconsole.conf &lt;&lt; "EOF"
 <literal>KEYMAP=de-latin1
 FONT=Lat2-Terminus16</literal>

+ 2 - 1
chapter07/network.xml

@@ -60,7 +60,8 @@
 
     <para>作为示例,以下命令为
     <emphasis>eth0</emphasis> 设备创建一个静态 IP 地址配置:</para>
-
+<!-- jhalfs relies on the values for IFACE, IP, etc. If you want to change
+     them, please inform the jhalfs maintainer. -->
 <screen><userinput>cd /etc/sysconfig/
 cat &gt; ifconfig.eth0 &lt;&lt; "EOF"
 <literal>ONBOOT=yes

+ 3 - 2
chapter07/networkd.xml

@@ -130,10 +130,11 @@ EOF</userinput></screen>
 
       <para>以下命令为静态 IP 设置创建一个基本的配置文件
       (使用 systemd-networkd 和 systemd-resolved)。</para>
-
+<!-- jhalfs relies on the values for Name, Address, etc. If you want to change
+     them, please inform the jhalfs maintainer. -->
 <screen><userinput>cat &gt; /etc/systemd/network/10-eth-static.network &lt;&lt; "EOF"
 <literal>[Match]
-Name=&lt;网络设备名&gt;
+Name=<replaceable>&lt;网络设备名&gt;</replaceable>
 
 [Network]
 Address=192.168.0.2/24

+ 3 - 4
chapter07/usage.xml

@@ -631,12 +631,11 @@ EOF</userinput></screen>
     </listitem>
 
     <listitem>
-      <!--para>The following is a Unicode-enabled example for Bulgarian, where a
-      stock UTF-8 keymap exists:</para-->
       <para>下面是使用 Unicode 的白罗斯语配置,对于该语言,
       可以使用已有的 UTF-8 键映射:</para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
+<!-- This is what is used by jhalfs for creating the console file: whenever
+     you change the following, please inform the jhalfs maintainer(s). -->
+<screen><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
 <literal># Begin /etc/sysconfig/console
 
 UNICODE="1"