From 54c0a86cd0018e94b4db71caf36ca09f84154aa0 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 23 Aug 2024 19:23:13 +0800
Subject: [PATCH 1/2] bootscripts: console: Fix fb console detection

If CONFIG_FB is not set but CONFIG_DRM_FBDEV_EMULATION is set to y, on a
DRM-drived graphic card (anything from AMD/ATI, Intel, or NVIDIA in
recent 20 years) we'd be using a fb console but without
/sys/class/graphics/fb0.  Then the script won't run setfont for VT 2-6.

Check /sys/class/graphics/fbcon instead of /sys/class/graphics/fb0 to
fix the issue.

Closes: https://lists.linuxfromscratch.org/sympa/arc/lfs-support/2024-08/msg00001.html
Reported-by: Alan Ianson <agianson@gmail.com>
---
 bootscripts/ChangeLog          |  6 ++++++
 bootscripts/lfs/init.d/console |  2 +-
 chapter01/changelog.xml        | 11 +++++++++++
 packages.ent                   |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index 558230238..d3a7ed661 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,9 @@
+2024-08-23 Xi Ruoyao <xry111@xry111.site>
+   * In console, detect FB console by checking /sys/class/graphics/fbcon
+     instead of fb0.  The latter does not exist if CONFIG_FB=n, but
+     CONFIG_DRM_FBDEV_EMULATION=y can support a FB console without
+     CONFIG_FB.
+
 2024-07-12 Xi Ruoyao <xry111@xry111.site>
    * In mountvirtfs, recreate /dev/fd correctly if it's already created
      by the initramfs.
diff --git a/bootscripts/lfs/init.d/console b/bootscripts/lfs/init.d/console
index a5338cc71..9409e4757 100644
--- a/bootscripts/lfs/init.d/console
+++ b/bootscripts/lfs/init.d/console
@@ -47,7 +47,7 @@ case "${1}" in
       log_info_msg "Setting up Linux console..."
 
       # Figure out if a framebuffer console is used
-      [ -d /sys/class/graphics/fb0 ] && use_fb=1 || use_fb=0
+      [ -d /sys/class/graphics/fbcon ] && use_fb=1 || use_fb=0
 
       # Figure out the command to set the console into the
       # desired mode
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4e420b168..7f58d2d3b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,17 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2024-08-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to lfs-bootscripts-20240823, to fix an
+          issue causing VT 2-6 not affected by the FONT= setting in
+          /etc/sysconfig/console.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-08-17</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index d95e49225..86242dd7d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -381,7 +381,7 @@
 <!ENTITY less-fin-du "14 MB">
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20240717">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20240823">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">

From 872a378f5e0b75229d2adffad621dcf95cbe5ab4 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Fri, 23 Aug 2024 13:59:56 -0500
Subject: [PATCH 2/2] Typos on comments.

These changes are all in comments that do not affect the books in any way.
---
 aux-file-data.sh                           | 2 +-
 git-version.sh                             | 2 +-
 lfs-latest-git.php                         | 2 +-
 packages.ent                               | 2 +-
 stylesheets/lfs-xsl/chunkfast.xsl          | 2 +-
 stylesheets/lfs-xsl/common.xsl             | 4 ++--
 stylesheets/lfs-xsl/pdf.xsl                | 4 ++--
 stylesheets/lfs-xsl/pdf/lfs-lists.xsl      | 6 +++---
 stylesheets/lfs-xsl/pdf/lfs-mixed.xsl      | 4 ++--
 stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl  | 2 +-
 stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl    | 8 ++++----
 stylesheets/lfs-xsl/xhtml/lfs-sections.xsl | 4 ++--
 stylesheets/lfs-xsl/xhtml/lfs-toc.xsl      | 2 +-
 stylesheets/patcheslist.xsl                | 2 +-
 stylesheets/wget-list.xsl                  | 2 +-
 udev-lfs/README                            | 2 +-
 udev-lfs/init-net-rules.sh                 | 2 +-
 17 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/aux-file-data.sh b/aux-file-data.sh
index 8be1b1d15..01539fef6 100755
--- a/aux-file-data.sh
+++ b/aux-file-data.sh
@@ -15,7 +15,7 @@ base=$(basename $bootscripts .tar.xz)
 bootsize=$(ls -l --block-size=1024 $bootscripts | cut -f5 -d" ")
 bootmd5=$(md5sum $bootscripts | cut -f1 -d" ")
 
-# Figure intalled size of bootscripts
+# Figure installed size of bootscripts
 TOPDIR=$(pwd)
 TMP_DIR=$(mktemp -d /tmp/lfsbootfiles.XXXXXX)
 pushd $TMP_DIR > /dev/null
diff --git a/git-version.sh b/git-version.sh
index 09a8fadd7..9d6c3fe0a 100755
--- a/git-version.sh
+++ b/git-version.sh
@@ -19,7 +19,7 @@ if [ -e LFS-RELEASE ]; then
 fi
 
 if ! git status > /dev/null; then
-    # Either it's not a git repository, or git is unavaliable.
+    # Either it's not a git repository or git is unavaliable.
     # Just workaround.
     echo "<![ %sysv; ["                                    >  version.ent
     echo "<!ENTITY version           \"unknown\">"         >> version.ent
diff --git a/lfs-latest-git.php b/lfs-latest-git.php
index ce76e970e..55c634e0b 100644
--- a/lfs-latest-git.php
+++ b/lfs-latest-git.php
@@ -322,7 +322,7 @@ function get_current()
       $file = basename( $line ) . "\n";
       if ( preg_match( "/patch$/", $file ) ) { continue; } // Skip patches
 
-      $file = preg_replace( "/bz2/", '', $file ); // The 2 confusses the regex
+      $file = preg_replace( "/bz2/", '', $file ); // The 2 confuses the regex
 
       $file        = rtrim( $file );
       $pkg_pattern = "/(\D*).*/";
diff --git a/packages.ent b/packages.ent
index 86242dd7d..e21d6b718 100644
--- a/packages.ent
+++ b/packages.ent
@@ -2,7 +2,7 @@
 
 <!-- Notes:
      For empty *-home entities use " " not ""
-     Packages sizes allways in KB
+     Packages sizes always in KB
      Allowed deviation in SBUs : 10%
      Allowed deviation in disk usage : 2%
 
diff --git a/stylesheets/lfs-xsl/chunkfast.xsl b/stylesheets/lfs-xsl/chunkfast.xsl
index 6d9d823a5..c9338820f 100644
--- a/stylesheets/lfs-xsl/chunkfast.xsl
+++ b/stylesheets/lfs-xsl/chunkfast.xsl
@@ -8,7 +8,7 @@
                 exclude-result-prefixes="cf exsl">
 
    <!-- Top-level chunked code for fast processing.
-        Import standart customized chunk code.
+        Import standard customized chunk code.
         Replaces {docbook-xsl}/xhtml/chunkfast.xsl
 
         Note: Using this file as the top-level for chunked output implies that
diff --git a/stylesheets/lfs-xsl/common.xsl b/stylesheets/lfs-xsl/common.xsl
index 028732d02..7d07c999c 100644
--- a/stylesheets/lfs-xsl/common.xsl
+++ b/stylesheets/lfs-xsl/common.xsl
@@ -36,7 +36,7 @@
   </xsl:template>
 
     <!-- indexterm:
-           Dropping unneeded anchors and fo:wraper elemments. -->
+           Dropping unneeded anchors and fo:wrapper elemments. -->
     <!-- The original templates are in {docbook-xsl}/{xhtml,fo}/index.xsl -->
   <xsl:template match="indexterm"/>
 
@@ -111,7 +111,7 @@
         </xsl:when>
         <xsl:when test="$section.autolabel != 0">
           <xsl:choose>
-            <!-- If the first sect2 isn't numbered, renumber the remainig sections -->
+            <!-- If the first sect2 isn't numbered, renumber the remaining sections -->
             <xsl:when test="string-length(../sect2[1]/title) = 0">
               <xsl:variable name="totalsect2">
                 <xsl:number count="sect2"/>
diff --git a/stylesheets/lfs-xsl/pdf.xsl b/stylesheets/lfs-xsl/pdf.xsl
index ea247f5db..e1c03147c 100644
--- a/stylesheets/lfs-xsl/pdf.xsl
+++ b/stylesheets/lfs-xsl/pdf.xsl
@@ -27,7 +27,7 @@
   <xsl:include href="pdf/lfs-pagesetup.xsl"/>
   <xsl:include href="pdf/lfs-xref.xsl"/>
 
-  <!-- Activate FOP-1 extensions. We use FOP-0.93 as the FO procesor. -->
+  <!-- Activate FOP-1 extensions. We use FOP-0.93 as the FO processor. -->
   <xsl:param name="fop1.extensions" select="1"/>
 
   <!-- Deactivate draft mode. -->
@@ -93,7 +93,7 @@
   <!-- Processing instruction for hard page breaks.
        FOP-0.93 supports @keep-*.*, @orphans, and @widows attributes,
        that solves several page break issues.
-       It also supports the soft page break procesing instruction included
+       It also supports the soft page break processing instruction included
        in the DocBook stylesheets.
        But sometimes we may need hard page breaks for final book versions.
        To understand all of the page break features, see
diff --git a/stylesheets/lfs-xsl/pdf/lfs-lists.xsl b/stylesheets/lfs-xsl/pdf/lfs-lists.xsl
index c3abb960e..c52257959 100644
--- a/stylesheets/lfs-xsl/pdf/lfs-lists.xsl
+++ b/stylesheets/lfs-xsl/pdf/lfs-lists.xsl
@@ -39,8 +39,8 @@
   <xsl:param name="variablelist.max.termlength">35</xsl:param>
 
     <!-- varlistentry mode block:
-           Addibg a bullet, left alignament, and @kepp-*.* attributes
-           for packages and paches list. -->
+           Addibg a bullet, left alignment, and @kepp-*.* attributes
+           for packages and patches list. -->
     <!-- The original template is in {docbook-xsl}/fo/list.xsl -->
   <xsl:template match="varlistentry" mode="vl.as.blocks">
     <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
@@ -135,7 +135,7 @@
   </xsl:template>
 
     <!-- simplelist:
-           Self-made template. Wrap it into a fo:block and process member childs.
+           Self-made template. Wrap it into a fo:block and process member child.
            If @type is specified, the original templates will be used.
            NOTE: when using type='horiz' or type='vert', FOP-0.93 will complaints
              about not supported table-layout="auto" -->
diff --git a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
index e5c7ae090..f38699e9c 100644
--- a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
+++ b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
@@ -128,7 +128,7 @@
   </xsl:template>
 
     <!-- literal:
-           Be sure that literal will use allways normal font weight. -->
+           Be sure that literal will use always normal font weight. -->
     <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
   <xsl:template match="literal">
     <fo:inline  font-weight="normal">
@@ -139,7 +139,7 @@
     <!-- inline.monoseq:
            Added hyphenate-url support to classname, exceptionname, interfacename,
            methodname, computeroutput, constant, envar, filename, function, code,
-           literal, option, promt, systemitem, varname, sgmltag, tag, and uri -->
+           literal, option, prompt, systemitem, varname, sgmltag, tag, and uri -->
     <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
   <xsl:template name="inline.monoseq">
     <xsl:param name="content">
diff --git a/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl b/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
index 7ec85ddf4..5578fd661 100644
--- a/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
+++ b/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
@@ -176,7 +176,7 @@
   </xsl:template>
 
     <!-- chapter title:
-           Small font size and left alignament. -->
+           Small font size and left alignment. -->
     <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
   <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
     <fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style"
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl b/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
index f6780385a..59859c12e 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
@@ -4,9 +4,9 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 version="1.0">
 
-  <!-- This stylesheet contains misc templates for output formating.
+  <!-- This stylesheet contains misc templates for output formatting.
        This file is for that templates that don't fit in other files
-       and that not afect the chunk algorithm. -->
+       and that do not affect the chunk algorithm. -->
 
   <!-- Individual elements templates -->
 
@@ -187,7 +187,7 @@
   </xsl:template>
 
     <!-- para/simplelist:
-           Self-made template. Add a line break and process the childs.
+           Self-made template. Add a line break and process the child.
            If @type is specified, the original templates should be used,
            but not tested. -->
   <xsl:template match="para/simplelist">
@@ -208,7 +208,7 @@
   </xsl:template>
 
 
-  <!-- Named formating templates -->
+  <!-- Named formatting templates -->
 
     <!-- Body attributes:
            Add to the body XHTML output tag a class attribute with the book type
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl b/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
index c44aa229c..b13e5e11b 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
@@ -145,7 +145,7 @@
   </xsl:template>
 
     <!-- sect1:
-           When there is a role attibute, use it as the class value.
+           When there is a role attribute, use it as the class value.
            Process the SVN keywords found in sect1info as a footnote.
            Output title before the containing <div> so that the title
            can be at a fixed position.
@@ -171,7 +171,7 @@
   </xsl:template>
 
     <!-- sect2:
-           When there is a role attibute, use it as the class value.
+           When there is a role attribute, use it as the class value.
            Removed unused code. -->
     <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
   <xsl:template match="sect2">
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl b/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
index 36c4ba3fe..5dbe2136e 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
@@ -65,7 +65,7 @@
   </xsl:template>
 
     <!-- toc.line:
-           Adding the h* tags and dropping unneded links.
+           Adding the h* tags and dropping unneeded links.
            This template is a full re-made version of the original one. -->
     <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
   <xsl:template name="toc.line">
diff --git a/stylesheets/patcheslist.xsl b/stylesheets/patcheslist.xsl
index f863edc1f..94e33b70b 100644
--- a/stylesheets/patcheslist.xsl
+++ b/stylesheets/patcheslist.xsl
@@ -51,7 +51,7 @@ exit
   <xsl:template match="//text()"/>
 
   <xsl:template match="//ulink">
-      <!-- Match only local patches links and skip duplicated URLs splitted for PDF output-->
+      <!-- Match only local patch links and skip duplicated URLs split for PDF output-->
     <xsl:if test="contains(@url, '.patch') and contains(@url, '&patches-root;')
             and not(ancestor-or-self::*/@condition = 'pdf')">
       <xsl:variable name="patch.name" select="substring-after(@url, '&patches-root;')"/>
diff --git a/stylesheets/wget-list.xsl b/stylesheets/wget-list.xsl
index eca53a4c9..09f99cd22 100644
--- a/stylesheets/wget-list.xsl
+++ b/stylesheets/wget-list.xsl
@@ -15,7 +15,7 @@
   <xsl:template match="ulink">
       <!-- If some package don't have the predefined strings in their
       name, the next test must be fixed to match it also. Skip possible
-      duplicated URLs due that may be splitted for PDF output -->
+      duplicated URLs due that may be split for PDF output -->
     <xsl:if test="(contains(@url, '.tar.') or
                    contains(@url, '.tgz')  or
                    contains(@url, '.patch')) and
diff --git a/udev-lfs/README b/udev-lfs/README
index 1f050eb15..9ce7fbef9 100644
--- a/udev-lfs/README
+++ b/udev-lfs/README
@@ -1,6 +1,6 @@
 The udev-lfs set of files is a customization of systemd.
 In 2012, udev was merged with systemd and a build methodology
-incompatible with LFS.  These files add cusom udev rules
+incompatible with LFS.  These files add custom udev rules
 for LFS.
 
 These files are distributed in the form of a tar file available
diff --git a/udev-lfs/init-net-rules.sh b/udev-lfs/init-net-rules.sh
index 1ad22db8c..f8a731f74 100644
--- a/udev-lfs/init-net-rules.sh
+++ b/udev-lfs/init-net-rules.sh
@@ -2,7 +2,7 @@
 
 # This script generates rules for persistent network device naming
 # Data from udev-182 75-persistent-net-generator.rules
-# Updated fof udev-197 (DEVICES=en*)
+# Updated for udev-197 (DEVICES=en*)
 
 RULES=/etc/udev/rules.d/70-persistent-net.rules
 DEVICES=$(eval echo /sys/class/net/{en*,eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*})