Changeset 8154126

Timestamp:

03/09/2019 08:28:01 AM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

cdf7a68

Parents:

5323dbf

Message:

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

Location:

chapter07

Files:

• clock.xml (modified) (1 diff)
• consoled.xml (modified) (1 diff)
• network.xml (modified) (1 diff)
• networkd.xml (modified) (1 diff)
• usage.xml (modified) (1 diff)

chapter07/clock.xml

@@ -37 +37 @@
   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

chapter07/consoled.xml

@@ -76 +76 @@
 
   <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>

chapter07/network.xml

@@ -47 +47 @@
     <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"

chapter07/networkd.xml

@@ -112 +112 @@
       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]

chapter07/usage.xml

@@ -490 +490 @@
       <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