From 69854d2a873d74a7956e34d3f29f28aafa5c07f7 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Wed, 25 Jan 2023 13:10:44 -0600 Subject: [PATCH 1/6] Edit systemd chapters for grammar and idiom. --- chapter08/dbus.xml | 4 +-- chapter08/markupsafe.xml | 2 +- chapter08/systemd.xml | 62 ++++++++++++++++++++-------------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/chapter08/dbus.xml b/chapter08/dbus.xml index 71a93e5cb..8f3c80f7a 100644 --- a/chapter08/dbus.xml +++ b/chapter08/dbus.xml @@ -67,9 +67,9 @@ --with-system-socket=/run/dbus/system_bus_socket - These set the location of the PID file and the system bus socket + These cause the PID file and the system bus socket to be in /run, instead of - deprecated /var/run. + the deprecated /var/run. diff --git a/chapter08/markupsafe.xml b/chapter08/markupsafe.xml index 9481a194a..27fdb1627 100644 --- a/chapter08/markupsafe.xml +++ b/chapter08/markupsafe.xml @@ -23,7 +23,7 @@ - <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> <segmentedlist> diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 2c5c0e11b..60b5f3605 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -60,7 +60,7 @@ cd build meson --prefix=/usr \ - --buildtype=release \ + --buildtype=release \location of the -Ddefault-dnssec=no \ -Dfirstboot=false \ -Dinstall-tests=false \ @@ -82,7 +82,7 @@ meson --prefix=/usr \ <term><parameter>--buildtype=release</parameter></term> <listitem> <para>This switch overrides the default buildtype - (<quote>debug</quote>), which would produce unoptimized + (<quote>debug</quote>), which produces unoptimized binaries.</para> </listitem> </varlistentry> @@ -99,7 +99,7 @@ meson --prefix=/usr \ <listitem> <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> </varlistentry> @@ -115,9 +115,9 @@ meson --prefix=/usr \ <term><parameter>-Dldconfig=false</parameter></term> <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> @@ -137,15 +137,15 @@ meson --prefix=/usr \ <term><parameter>-Drpmmacrosdir=no</parameter></term> <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> <varlistentry> <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> @@ -154,7 +154,7 @@ meson --prefix=/usr \ <listitem> <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> @@ -194,12 +194,12 @@ meson --prefix=/usr \ <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> <screen><userinput remap="adjust">systemctl disable systemd-sysupdate{,-reboot}</userinput></screen> @@ -244,7 +244,7 @@ meson --prefix=/usr \ libnss_resolve.so.2, libnss_systemd.so.2, 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, /usr/lib/binfmt.d, /usr/lib/environment.d, /usr/lib/kernel, @@ -285,7 +285,7 @@ meson --prefix=/usr \ <listitem> <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> <indexterm zone="ch-system-systemd halt"> @@ -308,9 +308,9 @@ meson --prefix=/usr \ <varlistentry id="init"> <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"> <primary sortas="b-init">init</primary> @@ -332,7 +332,7 @@ meson --prefix=/usr \ <term><command>kernel-install</command></term> <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> </indexterm> @@ -485,8 +485,8 @@ meson --prefix=/usr \ <varlistentry id="systemd-analyze"> <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> </indexterm> @@ -497,7 +497,7 @@ meson --prefix=/usr \ <term><command>systemd-ask-password</command></term> <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> </indexterm> @@ -531,7 +531,7 @@ meson --prefix=/usr \ <term><command>systemd-cgtop</command></term> <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> </indexterm> @@ -552,8 +552,8 @@ meson --prefix=/usr \ <term><command>systemd-delta</command></term> <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> </indexterm> @@ -605,7 +605,7 @@ meson --prefix=/usr \ <varlistentry id="systemd-id128"> <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> </indexterm> @@ -649,7 +649,7 @@ meson --prefix=/usr \ <varlistentry id="systemd-notify"> <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"> <primary sortas="b-systemd-notify">systemd-notify</primary> @@ -660,7 +660,7 @@ meson --prefix=/usr \ <varlistentry id="systemd-nspawn"> <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"> <primary sortas="b-systemd-nspawn">systemd-nspawn</primary> @@ -682,7 +682,7 @@ meson --prefix=/usr \ <term><command>systemd-repart</command></term> <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> </indexterm> @@ -704,7 +704,7 @@ meson --prefix=/usr \ <term><command>systemd-run</command></term> <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"> <primary sortas="b-systemd-run">systemd-run</primary> @@ -736,7 +736,7 @@ meson --prefix=/usr \ <varlistentry id="systemd-tmpfiles"> <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 <filename class="directory">tmpfiles.d</filename> directories</para> @@ -793,7 +793,7 @@ meson --prefix=/usr \ <term><command>udevadm</command></term> <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> <indexterm zone="ch-system-systemd udevadm"> From c349b4a2b33dfe085b7f7733c5e70e8ed5f4f23d Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" <renodr@linuxfromscratch.org> Date: Wed, 25 Jan 2023 15:01:12 -0600 Subject: [PATCH 2/6] Fix the build of systemd due to the last commit --- chapter08/systemd.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 60b5f3605..1db7e1444 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -60,7 +60,7 @@ cd build meson --prefix=/usr \ - --buildtype=release \location of the + --buildtype=release \ -Ddefault-dnssec=no \ -Dfirstboot=false \ -Dinstall-tests=false \ From adba2dae8ac7f4a287b6cff32224e8cb6c7c7134 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs <bdubbs@linuxfromscratch.org> Date: Thu, 26 Jan 2023 10:40:42 -0600 Subject: [PATCH 3/6] Add a comment about nested command substitution "The command below shows an example of nested command substitution using two methods: backquotes and a $() construct. It could be rewritten using the same method for both substitutions, but is shown this way to demonstrate how they can be mixed. Generally the $() method is preferred." --- chapter05/gcc-pass1.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 7a431ec90..e0d503f8d 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -208,6 +208,14 @@ cd build</userinput></screen> header using a command that is identical to what the GCC build system does in normal circumstances:</para> + <note> + <para>The command below shows an example of nested command substitution + using two methods: backquotes and a $() construct. It could be rewritten + using the same method for both substitutions, but is shown this way + to demonstrate how they can be mixed. Generally the $() method is + preferred.</para> + </note> + <screen><userinput remap="install">cd .. cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \ `dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/install-tools/include/limits.h</userinput></screen> From 139b77e4a27c8bd120a4fd165d023456d86baa19 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao <xry111@xry111.site> Date: Fri, 27 Jan 2023 01:44:05 +0800 Subject: [PATCH 4/6] decorate new note about $() and `` --- chapter05/gcc-pass1.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index e0d503f8d..82efcd617 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -210,10 +210,10 @@ cd build</userinput></screen> <note> <para>The command below shows an example of nested command substitution - using two methods: backquotes and a $() construct. It could be rewritten - using the same method for both substitutions, but is shown this way - to demonstrate how they can be mixed. Generally the $() method is - preferred.</para> + using two methods: backquotes and a <literal>$()</literal> construct. + It could be rewritten using the same method for both substitutions, + but is shown this way to demonstrate how they can be mixed. Generally + the <literal>$()</literal> method is preferred.</para> </note> <screen><userinput remap="install">cd .. From 59d90df78aa7283fed38d2550633de203ec1b0c4 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao <xry111@xry111.site> Date: Fri, 27 Jan 2023 01:45:12 +0800 Subject: [PATCH 5/6] systemd: remove an extra word "both" It seems introduced unintentionally. I'm wondering what has happened with David's text editor :). --- chapter08/systemd.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 1db7e1444..5b1fc1fe5 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -244,7 +244,7 @@ meson --prefix=/usr \ libnss_resolve.so.2, libnss_systemd.so.2, 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,both + <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d, /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev, /etc/xdg/systemd, /usr/lib/systemd, /usr/lib/udev, /usr/include/systemd, /usr/lib/binfmt.d, /usr/lib/environment.d, /usr/lib/kernel, From 2d516c7a353d534e6fa96fd8b403a96f426bc27e Mon Sep 17 00:00:00 2001 From: Xi Ruoyao <xry111@xry111.site> Date: Sun, 29 Jan 2023 12:16:47 +0800 Subject: [PATCH 6/6] dependencies: use https for LessTif homepage --- appendices/dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 69232f239..eb600dc78 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -3079,7 +3079,7 @@ <seg> <ulink url="&blfs-book;x/installing.html">Xorg</ulink>, <ulink url="&blfs-book;x/gtk2.html">GTK+2</ulink>, - <ulink url="http://lesstif.sourceforge.net/">LessTif</ulink>, + <ulink url="https://lesstif.sourceforge.net/">LessTif</ulink>, <ulink url="&blfs-book;general/ruby.html">Ruby</ulink>, and <ulink url="&blfs-book;general/gpm.html">GPM</ulink> </seg>