Changeset 58634ab

Timestamp:

08/03/2023 10:30:09 PM (14 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib, xry111/multilib

Children:

3fb162f

Parents:

741890d (diff), 67ca5ef (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

Files:

• chapter04/settingenviron.xml (modified) (1 diff)
• chapter10/grub.xml (modified) (1 diff)
• obfuscate.sh (modified) (1 diff)

chapter04/settingenviron.xml

@@ -119 +119 @@
 
     <varlistentry>
-      <term><parameter>LFS_TGT=(uname -m)-lfs-linux-gnu</parameter></term>
+      <term><parameter>LFS_TGT=$(uname -m)-lfs-linux-gnu</parameter></term>
       <listitem>
   <para>The <envar>LFS_TGT</envar> variable sets a non-default, but compatible machine

chapter10/grub.xml

@@ -142 +142 @@
 set timeout=5
 
+insmod part_gpt
 insmod ext2
 set root=(hd0,2)

obfuscate.sh

@@ -5 +5 @@
 # Script written (and slight perl modification) by Archaic <archaic AT linuxfromscratch D0T org>
 # Modified from "sed -i" to old style "sed -e" by Manuel Canales <manuel AT linuxfromscratch D0T org>
-# to prevent hangs on very long files, like nonckunked books.
+# to prevent hangs on very long files, like nonchunked books.
 # Original Perl expression by Anderson Lizardo <lizardo AT linuxfromscratch D0T org>
 # Released under the GNU General Public License