From 0389538132fee341f978a21150daa420f6bafb8b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Mon, 17 May 2021 23:09:39 +0800
Subject: [PATCH 1/4] bzip2: replace copies of bzip2 executable with symlinks

---
 chapter08/bzip2.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/chapter08/bzip2.xml b/chapter08/bzip2.xml
index 5d1e53469..68f567fcd 100644
--- a/chapter08/bzip2.xml
+++ b/chapter08/bzip2.xml
@@ -89,9 +89,13 @@ make clean</userinput></screen>
 ln -sv libbz2.so.&bzip2-version; /usr/lib/libbz2.so</userinput></screen>
 
     <para>Install the shared <command>bzip2</command> binary into the
-    <filename class="directory">/usr/bin</filename> directory:</para>
+    <filename class="directory">/usr/bin</filename> directory, and replace
+    two copies of <command>bzip2</command> with symlinks:</para>
 
-<screen><userinput remap="install">cp -v bzip2-shared /usr/bin/bzip2</userinput></screen>
+<screen><userinput remap="install">cp -v bzip2-shared /usr/bin/bzip2
+for i in /usr/bin/{bzcat,bunzip2}; do
+  ln -sfv bzip2 $i
+done</userinput></screen>
 
     <para>Remove an useless static library:</para>
 

From bbea6a3273f94f00c2ea35224197380054e0f503 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Tue, 18 May 2021 01:02:07 +0800
Subject: [PATCH 2/4] fix user and group name for systemd-oomd

---
 chapter07/createfiles.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chapter07/createfiles.xml b/chapter07/createfiles.xml
index 1e6b2df9f..93abeaf8e 100644
--- a/chapter07/createfiles.xml
+++ b/chapter07/createfiles.xml
@@ -83,7 +83,7 @@ systemd-resolve:x:77:77:systemd Resolver:/:/bin/false
 systemd-timesync:x:78:78:systemd Time Synchronization:/:/bin/false
 systemd-coredump:x:79:79:systemd Core Dumper:/:/bin/false
 uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/bin/false
-systemd-oomd:x:81:81:systemd Out Of Memory Daemon:/:/bin/false
+systemd-oom:x:81:81:systemd Out Of Memory Daemon:/:/bin/false
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 
@@ -153,7 +153,7 @@ systemd-resolve:x:77:
 systemd-timesync:x:78:
 systemd-coredump:x:79:
 uuidd:x:80:
-systemd-oomd:x:81:81:
+systemd-oom:x:81:81:
 wheel:x:97:
 nogroup:x:99:
 users:x:999:</literal>

From 9901d50d9a75e5477fc0bd042a03e3bdf5f7db01 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 17 May 2021 14:34:48 -0500
Subject: [PATCH 3/4] Tweak install directories for eudev and e2fsprogs

---
 chapter01/changelog.xml | 10 ++++++++++
 chapter08/e2fsprogs.xml |  1 +
 chapter08/eudev.xml     |  1 +
 3 files changed, 12 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 614731b11..135710fd0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-05-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Tweak install directories for eudev and e2fsprogs.
+          Thanks to Ryan Marsaw for the report.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2021-05-14</para>
       <itemizedlist>
diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml
index d7ff53a82..2ebe2dd3d 100644
--- a/chapter08/e2fsprogs.xml
+++ b/chapter08/e2fsprogs.xml
@@ -53,6 +53,7 @@ cd       build</userinput></screen>
     <para>Prepare e2fsprogs for compilation:</para>
 
 <screen><userinput remap="configure">../configure --prefix=/usr           \
+             --sysconfdir=/etc       \
              --enable-elf-shlibs     \
              --disable-libblkid      \
              --disable-libuuid       \
diff --git a/chapter08/eudev.xml b/chapter08/eudev.xml
index 0dee78d68..aa86f5150 100644
--- a/chapter08/eudev.xml
+++ b/chapter08/eudev.xml
@@ -53,6 +53,7 @@
     <para>Prepare Eudev for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr           \
+            --bindir=/usr/sbin      \
             --sysconfdir=/etc       \
             --enable-manpages       \
             --disable-static</userinput></screen>

From 7ffe1b81690fd49fa88c6650b8b77818f17df50b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Tue, 18 May 2021 12:55:25 +0800
Subject: [PATCH 4/4] add --localstatedir= for temp findutils

It's to prevent the creation of an empty /usr/var.
---
 chapter06/findutils.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index ff08a51cd..7bb0c7219 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -45,8 +45,9 @@
 
     <para>Prepare Findutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr   \
-            --host=$LFS_TGT \
+<screen><userinput remap="configure">./configure --prefix=/usr                   \
+            --localstatedir=/var/lib/locate \
+            --host=$LFS_TGT                 \
             --build=$(build-aux/config.guess)</userinput></screen>
 
     <para>Compile the package:</para>