aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter07/network.xml11
-rw-r--r--chapter07/systemd-custom.xml66
-rw-r--r--general.ent4
4 files changed, 71 insertions, 20 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0496b3241..0d0f9cf84 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
</listitem>
-->
<listitem>
+ <para>2016-05-20</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dj] - Add additional explanatory text for sytemctl and
+ journalctl commands.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2016-05-19</para>
<itemizedlist>
<listitem>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index c1041bca6..86dcb3e53 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -63,11 +63,13 @@ Name=eth0
[Network]
Address=192.168.0.2/24
Gateway=192.168.0.1
-DNS=192.168.0.1</literal>
+DNS=192.168.0.1
+Domains=<replaceable>&lt;Your Domain Name&gt;</replaceable></literal>
EOF</userinput></screen>
<para>Multiple DNS entries can be added if you have more than one DNS
- server.</para>
+ server. Do not include DNS or Domains entries if you intend to use a
+ static <filename>/etc/reslov.conf</filename> file.</para>
</sect3>
@@ -82,7 +84,10 @@ EOF</userinput></screen>
Name=eth0
[Network]
-DHCP=ipv4</literal>
+DHCP=ipv4
+
+[DHCP]
+UseDomains=true</literal>
EOF</userinput></screen>
</sect3>
diff --git a/chapter07/systemd-custom.xml b/chapter07/systemd-custom.xml
index 31326b32d..0c8ca75b9 100644
--- a/chapter07/systemd-custom.xml
+++ b/chapter07/systemd-custom.xml
@@ -108,32 +108,68 @@ EOF</userinput></screen>
<sect2>
<title>Debugging the Boot Sequence</title>
- <para>There are several commands that can be used to help debug the systemd
- boot process. Here are some examples:</para>
+ <para>Rather than plain shell scripts used in SysVinit or BSD style init
+ systems, systemd uses a unified format for different type of startup
+ files (or units). The command <command>systemctl</command> is used to
+ enable, disable, controll state, and obtain status of unit files. Here
+ are some examples of frequently used commands:</para>
<itemizedlist>
- <listitem><para>systemctl list-units -t service [--all]</para></listitem>
- <listitem><para>systemctl list-units -t target [--all]</para></listitem>
- <listitem><para>systemctl show -p Wants multi-user.target</para></listitem>
- <listitem><para>systemctl status sshd.service</para></listitem>
+ <listitem>
+ <para><command>systemctl list-units -t <replaceable>&lt;service&gt;</replaceable> [--all]</command>:
+ lists loaded unit files of type service.</para>
+ </listitem>
+ <listitem>
+ <para><command>systemctl list-units -t <replaceable>&lt;target&gt;</replaceable> [--all]</command>:
+ lists loaded unit files of type target.</para>
+ </listitem>
+ <listitem>
+ <para><command>systemctl show -p Wants <replaceable>&lt;multi-user.target&gt;</replaceable></command>:
+ shows all units that depend on the multi-user target. Targets are
+ special unit files that are anogalous to runlevels under
+ SysVinit.</para>
+ </listitem>
+ <listitem>
+ <para><command>systemctl status <replaceable>&lt;servicename.service&gt;</replaceable></command>:
+ shows the status of the servicename service. The .service extension
+ can be omitted if there are no other unit files with the same name,
+ such as .socket files (which create a listening socket that provides
+ similar functionality to inetd/xinetd).</para>
+ </listitem>
</itemizedlist>
</sect2>
-<!--TBA
<sect2>
- <title>Working with journalctl</title>
+ <title>Working with the Systemd Journal</title>
- <para>Logging on a system booted with systemd is handled by the systemd
- journal.</para>
+ <para>Logging on a system booted with systemd is handled by
+ systemd-journald (default), rather than a typical unix syslog daemon.
+ systemd-journald write log entries to a binary file format, rather than
+ a plain text log file. To assist with parsing the file, the command
+ <command>journalctl</command> is provided. Here are some examples of
+ frequently used commands:</para>
<itemizedlist>
- <listitem><para>journalctl -r </para></listitem>
- <listitem><para>journalctl -u <replaceable>UNIT</replaceable></para></listitem>
- <listitem><para>journalctl -b[=ID] -r</para></listitem>
- <listitem><para>journalctl -f</para></listitem>
+ <listitem>
+ <para><command>journalctl -r</command>: shows all contents of the
+ journal in reverse chronological order.</para>
+ </listitem>
+ <listitem>
+ <para><command>journalctl -u <replaceable>UNIT</replaceable></command>:
+ shows the journal entries associated with the specified UNIT
+ file.</para>
+ </listitem>
+ <listitem>
+ <para><command>journalctl -b[=ID] -r</command>: shows the journal
+ entries since last successfull boot (or for boot ID) in reverse
+ chronological order.</para>
+ </listitem>
+ <listitem>
+ <para><command>journalctl -f</command>: povides functionality similar
+ to tail -f (follow).</para>
+ </listitem>
</itemizedlist>
</sect2>
--->
</sect1>
diff --git a/general.ent b/general.ent
index ab8bc961e..31d290ef3 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version "20160519-systemd">
+<!ENTITY version "20160520-systemd">
<!ENTITY short-version "systemd"> <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate "May 19th, 2016">
+<!ENTITY releasedate "May 20th, 2016">
<!ENTITY copyrightdate "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.10">
<!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->