浏览代码

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)

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11555 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Pierre Labastie 6 年之前
父节点
当前提交
81541264e9
共有 5 个文件被更改,包括 13 次插入8 次删除
  1. 1 1
      chapter07/clock.xml
  2. 4 2
      chapter07/consoled.xml
  3. 2 1
      chapter07/network.xml
  4. 3 2
      chapter07/networkd.xml
  5. 3 2
      chapter07/usage.xml

+ 1 - 1
chapter07/clock.xml

@@ -36,7 +36,7 @@
   <para>Create the <filename>/etc/adjtime</filename> file with the following contents
   <para>Create the <filename>/etc/adjtime</filename> file with the following contents
   if your hardware clock is set to local time:</para>
   if your hardware clock is set to local time:</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
 <literal>0.0 0 0.0
 0
 0
 LOCAL</literal>
 LOCAL</literal>

+ 4 - 2
chapter07/consoled.xml

@@ -75,8 +75,10 @@
   </variablelist>
   </variablelist>
 
 
   <para>An example for a German keyboard and console is given below:</para>
   <para>An example for a German keyboard and console is given below:</para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/vconsole.conf &lt;&lt; "EOF"
+<!-- 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><userinput>cat &gt; /etc/vconsole.conf &lt;&lt; "EOF"
 <literal>KEYMAP=de-latin1
 <literal>KEYMAP=de-latin1
 FONT=Lat2-Terminus16</literal>
 FONT=Lat2-Terminus16</literal>
 EOF</userinput></screen>
 EOF</userinput></screen>

+ 2 - 1
chapter07/network.xml

@@ -46,7 +46,8 @@
 
 
     <para>The following command creates a sample file for the
     <para>The following command creates a sample file for the
     <emphasis>eth0</emphasis> device with a static IP address:</para>
     <emphasis>eth0</emphasis> device with a static IP address:</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/
 <screen><userinput>cd /etc/sysconfig/
 cat &gt; ifconfig.eth0 &lt;&lt; "EOF"
 cat &gt; ifconfig.eth0 &lt;&lt; "EOF"
 <literal>ONBOOT=yes
 <literal>ONBOOT=yes

+ 3 - 2
chapter07/networkd.xml

@@ -111,10 +111,11 @@ EOF</userinput></screen>
       <para>The command below creates a basic configuration file for a
       <para>The command below creates a basic configuration file for a
       Static IP setup (using both systemd-networkd and
       Static IP setup (using both systemd-networkd and
       systemd-resolved):</para>
       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"
 <screen><userinput>cat &gt; /etc/systemd/network/10-eth-static.network &lt;&lt; "EOF"
 <literal>[Match]
 <literal>[Match]
-Name=&lt;network-device-name&gt;
+Name=<replaceable>&lt;network-device-name&gt;</replaceable>
 
 
 [Network]
 [Network]
 Address=192.168.0.2/24
 Address=192.168.0.2/24

+ 3 - 2
chapter07/usage.xml

@@ -489,8 +489,9 @@ EOF</userinput></screen>
     <listitem>
     <listitem>
       <para>The following is a Unicode-enabled example for Bulgarian, where a
       <para>The following is a Unicode-enabled example for Bulgarian, where a
       stock UTF-8 keymap exists:</para>
       stock UTF-8 keymap exists:</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
 <literal># Begin /etc/sysconfig/console
 
 
 UNICODE="1"
 UNICODE="1"