Changeset 8495845

Timestamp:

01/25/2023 11:30:11 PM (15 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

a2434bd4

Parents:

c9ae6a4 (diff), c349b4a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Location:

chapter08

Files:

• dbus.xml (modified) (1 diff)
• markupsafe.xml (modified) (1 diff)
• systemd.xml (modified) (22 diffs)

chapter08/dbus.xml

@@ -68 +68 @@
         </term>
         <listitem>
-          <para>These set the location of the PID file and the system bus socket
+          <para>These cause the PID file and the system bus socket
           to be in <filename class="directory">/run</filename>, instead of
-          deprecated <filename class="directory">/var/run</filename>.</para>
+          the deprecated <filename class="directory">/var/run</filename>.</para>
         </listitem>
       </varlistentry>

chapter08/markupsafe.xml

@@ -24 +24 @@
     <title/>
 
-    <para>MarkupSafe is a Python module that implements a XML/HTML/XHTML Markup
+    <para>MarkupSafe is a Python module that implements an XML/HTML/XHTML Markup
     safe string.</para>
 

chapter08/systemd.xml

@@ -83 +83 @@
         <listitem>
           <para>This switch overrides the default buildtype
-          (<quote>debug</quote>), which would produce unoptimized
+          (<quote>debug</quote>), which produces unoptimized
           binaries.</para>
         </listitem>
@@ -100 +100 @@
           <para>This switch prevents installation of systemd
           services responsible for setting up the system for
-          the first time. They are not useful for LFS because
+          the first time. These are not useful in LFS, because
           everything is done manually.</para>
         </listitem>
@@ -116 +116 @@
         <listitem>
           <para>This switch prevents installation of a systemd unit that runs
-          <command>ldconfig</command> at boot, which is not useful for source
-          distributions such as LFS and makes the boot time longer. Remove it
-          if the described feature is desired.</para>
+          <command>ldconfig</command> at boot; this is not useful for source
+          distributions such as LFS, and makes the boot time longer. Remove 
+          this option to enable running <command>ldconfig</command> at boot.</para>
         </listitem>
       </varlistentry>
@@ -138 +138 @@
         <listitem>
           <para>This switch disables installation of RPM Macros
-          for use with systemd because LFS does not support RPM.</para>
+          for use with systemd, because LFS does not support RPM.</para>
         </listitem>
       </varlistentry>
@@ -145 +145 @@
         <term><parameter>-D{userdb,homed}=false</parameter></term>
         <listitem>
-          <para>Remove two daemons that have dependencies that do not fit
-          the scope of LFS.</para>
+          <para>Remove two daemons with dependencies that do not fit
+          within the scope of LFS.</para>
         </listitem>
       </varlistentry>
@@ -155 +155 @@
           <para>Prevent the generation of man pages to avoid extra
           dependencies.  We will install pre-generated man pages for systemd
-          from a tarball later.</para>
+          from a tarball.</para>
         </listitem>
       </varlistentry>
@@ -195 +195 @@
 <screen><userinput remap="adjust">systemd-machine-id-setup</userinput></screen>
 
-    <para>Setup the basic target structure:</para>
+    <para>Set up the basic target structure:</para>
 
 <screen><userinput remap="adjust">systemctl preset-all</userinput></screen>
 
     <para>Disable two services for upgrading binary distros.  They are useless for
-    a basic Linux system built from source, and both will report an error if
+    a basic Linux system built from source, and each one will report an error if
     it's enabled but not configured:</para>
 
@@ -368 +368 @@
         libsystemd.so, libsystemd-shared-&systemd-version;.so (in /usr/lib/systemd),
         and libudev.so</seg>
-        <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
+        <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,both
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
         /etc/xdg/systemd, /usr/lib/systemd, /usr/lib/udev, /usr/include/systemd,
@@ -409 +409 @@
           <para>Normally invokes <command>shutdown</command> with the
           <parameter>-h</parameter> option, except when already in run-level 0,
-          then it tells the kernel to halt the system; it notes in the
+          when it tells the kernel to halt the system; it notes in the
           file <filename>/var/log/wtmp</filename> that the system is being
           brought down</para>
@@ -432 +432 @@
         <term><command>init</command></term>
         <listitem>
-          <para>Is the first process to be started when the kernel has initialized
-          the hardware which takes over the boot process and starts all
-          processes according to its configuration files. In this case, it starts
+          <para>Is the first process to be started after the kernel has initialized
+          the hardware; <command>init</command> takes over the boot process and starts the
+          processes specified by its configuration files; in this case, it starts
           systemd</para>
           <indexterm zone="ch-system-systemd init">
@@ -456 +456 @@
         <listitem>
           <para>Is used to add and remove kernel and initramfs images to and
-          from /boot. In LFS, this is done manually</para>
+          from /boot; in LFS, this is done manually</para>
           <indexterm zone="ch-system-systemd kernel-install">
             <primary sortas="b-kernel-install">kernel-install</primary>
@@ -609 +609 @@
         <term><command>systemd-analyze</command></term>
         <listitem>
-          <para>Is used to determine system startup performance of the current
-          boot, as well as identify troublesome systemd units</para>
+          <para>Is used to analyze system startup performance,
+          as well as identify troublesome systemd units</para>
           <indexterm zone="ch-system-systemd systemd-analyze">
             <primary sortas="b-systemd-analyze">systemd-analyze</primary>
@@ -621 +621 @@
         <listitem>
           <para>Is used to query a system password or passphrase from the user,
-          using a question message specified on the command line</para>
+          using a message specified on the Linux command line</para>
           <indexterm zone="ch-system-systemd systemd-ask-password">
             <primary sortas="b-systemd-ask-password">systemd-ask-password</primary>
@@ -655 +655 @@
         <listitem>
           <para>Shows the top control groups of the local Linux control group
-          hierarchy, ordered by their CPU, memory and disk I/O load</para>
+          hierarchy, ordered by their CPU, memory and disk I/O loads</para>
           <indexterm zone="ch-system-systemd systemd-cgtop">
             <primary sortas="b-systemd-cgtop">systemd-cgtop</primary>
@@ -676 +676 @@
         <listitem>
           <para>Is used to identify and compare configuration files in
-          <filename class="directory">/etc</filename> that override default
-          counterparts in <filename class="directory">/usr</filename></para>
+          <filename class="directory">/etc</filename> that override the defaults
+          in <filename class="directory">/usr</filename></para>
           <indexterm zone="ch-system-systemd systemd-delta">
             <primary sortas="b-systemd-delta">systemd-delta</primary>
@@ -729 +729 @@
         <term><command>systemd-id128</command></term>
         <listitem>
-          <para>Generates and prints id128 strings</para>
+          <para>Generates and prints id128 (UUID) strings</para>
           <indexterm zone="ch-system-systemd systemd-id128">
             <primary sortas="b-systemd-id128">systemd-id128</primary>
@@ -773 +773 @@
         <term><command>systemd-notify</command></term>
         <listitem>
-          <para>Is used by daemon scripts to notify the init system about status
+          <para>Is used by daemon scripts to notify the init system of status
           changes</para>
           <indexterm zone="ch-system-systemd systemd-notify">
@@ -784 +784 @@
         <term><command>systemd-nspawn</command></term>
         <listitem>
-          <para>Is used to run a command or OS in a light-weight namespace
+          <para>Is used to run a command, or an entire OS, in a light-weight namespace
           container</para>
           <indexterm zone="ch-system-systemd systemd-nspawn">
@@ -806 +806 @@
         <listitem>
           <para>Is used to grow and add partitions to a partition table when
-          systemd is used in an OS image (e.g. a container)</para>
+          systemd is used with an OS image (e.g. a container)</para>
           <indexterm zone="ch-system-systemd systemd-repart">
             <primary sortas="b-systemd-repart">systemd-repart</primary>
@@ -828 +828 @@
         <listitem>
           <para>Is used to create and start a transient .service or a .scope
-          unit and run the specified command in it. This is useful for
+          unit and run the specified command in it; this is useful for
           validating systemd units</para>
           <indexterm zone="ch-system-systemd systemd-run">
@@ -860 +860 @@
         <term><command>systemd-tmpfiles</command></term>
         <listitem>
-          <para>Creates, deletes and cleans up volatile and temporary files and
+          <para>Creates, deletes, and cleans up volatile and temporary files and
           directories, based on the configuration file format and location
           specified in
@@ -917 +917 @@
         <listitem>
           <para>Is a generic udev administration tool which controls the udevd
-          daemon, provides info from the Udev hardware database, monitors
+          daemon, provides info from the udev hardware database, monitors
           uevents, waits for uevents to finish, tests udev configuration, and
           triggers uevents for a given device</para>