Author: pierre
Date: Sat Mar  9 00:28:01 2019
New Revision: 11555

Log:
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)

Modified:
   trunk/BOOK/chapter07/clock.xml
   trunk/BOOK/chapter07/consoled.xml
   trunk/BOOK/chapter07/network.xml
   trunk/BOOK/chapter07/networkd.xml
   trunk/BOOK/chapter07/usage.xml

Modified: trunk/BOOK/chapter07/clock.xml
==============================================================================
--- trunk/BOOK/chapter07/clock.xml      Fri Mar  8 17:48:10 2019        (r11554)
+++ trunk/BOOK/chapter07/clock.xml      Sat Mar  9 00:28:01 2019        (r11555)
@@ -36,7 +36,7 @@
   <para>Create the <filename>/etc/adjtime</filename> file with the following 
contents
   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
 0
 LOCAL</literal>

Modified: trunk/BOOK/chapter07/consoled.xml
==============================================================================
--- trunk/BOOK/chapter07/consoled.xml   Fri Mar  8 17:48:10 2019        (r11554)
+++ trunk/BOOK/chapter07/consoled.xml   Sat Mar  9 00:28:01 2019        (r11555)
@@ -75,8 +75,10 @@
   </variablelist>
 
   <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
 FONT=Lat2-Terminus16</literal>
 EOF</userinput></screen>

Modified: trunk/BOOK/chapter07/network.xml
==============================================================================
--- trunk/BOOK/chapter07/network.xml    Fri Mar  8 17:48:10 2019        (r11554)
+++ trunk/BOOK/chapter07/network.xml    Sat Mar  9 00:28:01 2019        (r11555)
@@ -46,7 +46,8 @@
 
     <para>The following command creates a sample file for the
     <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/
 cat &gt; ifconfig.eth0 &lt;&lt; "EOF"
 <literal>ONBOOT=yes

Modified: trunk/BOOK/chapter07/networkd.xml
==============================================================================
--- trunk/BOOK/chapter07/networkd.xml   Fri Mar  8 17:48:10 2019        (r11554)
+++ trunk/BOOK/chapter07/networkd.xml   Sat Mar  9 00:28:01 2019        (r11555)
@@ -111,10 +111,11 @@
       <para>The command below creates a basic configuration file for a
       Static IP setup (using both systemd-networkd and
       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;network-device-name&gt;
+Name=<replaceable>&lt;network-device-name&gt;</replaceable>
 
 [Network]
 Address=192.168.0.2/24

Modified: trunk/BOOK/chapter07/usage.xml
==============================================================================
--- trunk/BOOK/chapter07/usage.xml      Fri Mar  8 17:48:10 2019        (r11554)
+++ trunk/BOOK/chapter07/usage.xml      Sat Mar  9 00:28:01 2019        (r11555)
@@ -489,8 +489,9 @@
     <listitem>
       <para>The following is a Unicode-enabled example for Bulgarian, where a
       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
 
 UNICODE="1"
-- 
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to