Changeset 81ef690 for chapter06

Timestamp:

03/31/2021 10:41:36 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

3ca4306

Parents:

8b0e0da8

git-author:

Thomas Trepl <thomas@…> (12/09/2019 07:38:51 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:36 AM)

Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11707 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• shadow.xml (modified) (2 diffs)
• systemd.xml (modified) (2 diffs)

chapter06/shadow.xml

@@ -51 +51 @@
 
     <para>Disable the installation of the <command>groups</command> program
-    and its man pages, as Coreutils provides a better version. Also 
-    Prevent the installation of manual pages that were already installed in
+    and its man pages, as Coreutils provides a better version. Also,
+    prevent the installation of manual pages that were already installed in
     <xref linkend="ch-system-man-pages"/>:</para>
 
@@ -108 +108 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
-
+    <!--
     <para>Move a misplaced program to its proper location:</para>
 
 <screen><userinput remap="install">mv -v /usr/bin/passwd /bin</userinput></screen>
+    -->
 
     <!-- <para>Move Shadow's libraries to more appropriate locations:</para>

chapter06/systemd.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
-
+<!--
     <para>First, apply a patch to fix various bugs since the release
     of systemd-243.</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-2.patch</userinput></screen>
+-->
 
     <para>Create a symlink to work around missing xsltproc:</para>
@@ -69 +70 @@
     rules:</para>
 
-<screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules/50-udev-default.rules.in</userinput></screen>
+<screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules.d/50-udev-default.rules.in</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>