diff options
| author | Pierre Labastie <pieere@linuxfromscratch.org> | 2019-03-09 08:28:01 +0000 |
|---|---|---|
| committer | Pierre Labastie <pieere@linuxfromscratch.org> | 2019-03-09 08:28:01 +0000 |
| commit | 81541264e937b66bdfef0f076dccc2e89c16bd0f (patch) | |
| tree | 6b255ecc0833a3ba9a7436850e94a4fbe66b9aad /chapter07 | |
| parent | 5323dbffae26954e14862842a9cb0ce4e74ddf5c (diff) | |
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
Diffstat (limited to 'chapter07')
| -rw-r--r-- | chapter07/clock.xml | 2 | ||||
| -rw-r--r-- | chapter07/consoled.xml | 6 | ||||
| -rw-r--r-- | chapter07/network.xml | 3 | ||||
| -rw-r--r-- | chapter07/networkd.xml | 5 | ||||
| -rw-r--r-- | chapter07/usage.xml | 5 |
5 files changed, 13 insertions, 8 deletions
diff --git a/chapter07/clock.xml b/chapter07/clock.xml index 7e6a91610..1c9542166 100644 --- a/chapter07/clock.xml +++ b/chapter07/clock.xml @@ -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 > /etc/adjtime << "EOF" +<screen><userinput>cat > /etc/adjtime << "EOF" <literal>0.0 0 0.0 0 LOCAL</literal> diff --git a/chapter07/consoled.xml b/chapter07/consoled.xml index c1bbf649e..d9ea00ab1 100644 --- a/chapter07/consoled.xml +++ b/chapter07/consoled.xml @@ -75,8 +75,10 @@ </variablelist> <para>An example for a German keyboard and console is given below:</para> - -<screen role="nodump"><userinput>cat > /etc/vconsole.conf << "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 > /etc/vconsole.conf << "EOF" <literal>KEYMAP=de-latin1 FONT=Lat2-Terminus16</literal> EOF</userinput></screen> diff --git a/chapter07/network.xml b/chapter07/network.xml index b5202fb62..601c7e074 100644 --- a/chapter07/network.xml +++ b/chapter07/network.xml @@ -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 > ifconfig.eth0 << "EOF" <literal>ONBOOT=yes diff --git a/chapter07/networkd.xml b/chapter07/networkd.xml index b446986fa..83b99a1ea 100644 --- a/chapter07/networkd.xml +++ b/chapter07/networkd.xml @@ -111,10 +111,11 @@ EOF</userinput></screen> <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 > /etc/systemd/network/10-eth-static.network << "EOF" <literal>[Match] -Name=<network-device-name> +Name=<replaceable><network-device-name></replaceable> [Network] Address=192.168.0.2/24 diff --git a/chapter07/usage.xml b/chapter07/usage.xml index bce0c781f..b160ff368 100644 --- a/chapter07/usage.xml +++ b/chapter07/usage.xml @@ -489,8 +489,9 @@ EOF</userinput></screen> <listitem> <para>The following is a Unicode-enabled example for Bulgarian, where a stock UTF-8 keymap exists:</para> - -<screen role="nodump"><userinput>cat > /etc/sysconfig/console << "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 > /etc/sysconfig/console << "EOF" <literal># Begin /etc/sysconfig/console UNICODE="1" |