mirror of
https://github.com/Poltern/lfs-ru.git
synced 2024-10-18 11:50:21 +03:00
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. Typos on comments. These changes are all in comments that do not affect the books in any way. sysklogd Turn off network logging by default Update to lfs-bootscripts-20240825 Fix typos
This commit is contained in:
Poltern
parent
adcb9bb89b
commit
8cd1e8e64d
@ -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
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
2024-08-25 Xi Ruoyao <xry111@xry111.site>
|
||||
* Remove an empty line and an outdated comment (not valid anymore after
|
||||
/usr merge) from init-functions.
|
||||
|
||||
2024-08-24 Andrew Kreimer <algonell@gmail.com>
|
||||
* Fix typos.
|
||||
|
||||
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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -457,11 +457,8 @@ pidofproc()
|
||||
|
||||
# If a PID file is set and exists, use it.
|
||||
if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
|
||||
|
||||
# Use the value in the first line of the pidfile
|
||||
pidlist=`/bin/head -n1 "${pidfile}"`
|
||||
# This can optionally be written as 'sed 1q' to repalce 'head -n1'
|
||||
# should LFS move /bin/head to /usr/bin/head
|
||||
else
|
||||
# Use pidof
|
||||
pidlist=`pidof "${program}"`
|
||||
|
||||
@ -94,7 +94,7 @@ NOTES
|
||||
compound device such as a bridge.
|
||||
|
||||
ONBOOT - If set to 'yes', the specified interface is
|
||||
configured by the netowrk boot script.
|
||||
configured by the network boot script.
|
||||
|
||||
GATEWAY - The default IP address to use for routing if
|
||||
the destination IP address is not in a static
|
||||
@ -112,7 +112,7 @@ NOTES
|
||||
This list is normally a single value, e.g. eth0,
|
||||
for use with a virtual host such as kvm.
|
||||
|
||||
Other paramters that are service specific include:
|
||||
Other parameters that are service specific include:
|
||||
|
||||
ipv4-static
|
||||
|
||||
@ -128,7 +128,7 @@ NOTES
|
||||
additional IP addresses to a network
|
||||
device. Example: eth0:2 (optional)
|
||||
|
||||
BROADCAST - The brodcast address for this interface,
|
||||
BROADCAST - The broadcast address for this interface,
|
||||
e.g 192.168.1.255. If not specified,
|
||||
the broadcast address will be calculated
|
||||
from the IP and PREFIX.
|
||||
@ -154,7 +154,7 @@ NOTES
|
||||
DHCP_START - Optional parameters to pass to the dhcp client
|
||||
at startup.
|
||||
|
||||
DHCP_STOP - Optional paremeters to pass to the dhcp client
|
||||
DHCP_STOP - Optional parameters to pass to the dhcp client
|
||||
at shutdown.
|
||||
|
||||
PRINTIP - Flag to print the dhcp address to stdout
|
||||
|
||||
@ -39,6 +39,27 @@
|
||||
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-20240825. Only trivial
|
||||
non-functional changes.</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</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>
|
||||
|
||||
@ -297,7 +297,7 @@
|
||||
</itemizedlist>
|
||||
|
||||
<itemizedlist>
|
||||
<title>Removed:</title>
|
||||
<title>Удалены:</title>
|
||||
<listitem>
|
||||
<para>bash-5.2.21-upstream_fixes-1.patch</para>
|
||||
</listitem>
|
||||
|
||||
@ -86,6 +86,9 @@ mail.* -/var/log/mail.log
|
||||
user.* -/var/log/user.log
|
||||
*.emerg *
|
||||
|
||||
# Do not open any internet ports.
|
||||
secure_mode 2
|
||||
|
||||
# End /etc/syslog.conf</literal>
|
||||
EOF</userinput></screen>
|
||||
|
||||
|
||||
@ -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 unavailable.
|
||||
# Just workaround.
|
||||
echo "<![ %sysv; [" > version.ent
|
||||
echo "<!ENTITY version \"unknown\">" >> version.ent
|
||||
|
||||
@ -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*).*/";
|
||||
|
||||
10
packages.ent
10
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%
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
<!ENTITY bison-tmp-du "57 MB">
|
||||
<!ENTITY bison-tmp-sbu "0.2 SBU">
|
||||
<!ENTITY bison-fin-du "62 MB">
|
||||
<!ENTITY bison-fin-sbu "2.3 SBU">
|
||||
<!ENTITY bison-fin-sbu "2.2 SBU">
|
||||
|
||||
<!ENTITY bzip2-version "1.0.8">
|
||||
<!ENTITY bzip2-size "792 KB">
|
||||
@ -128,7 +128,7 @@
|
||||
<!ENTITY dejagnu-md5 "68c5208c58236eba447d7d6d1326b821">
|
||||
<!ENTITY dejagnu-home "&gnu-software;dejagnu/">
|
||||
<!ENTITY dejagnu-tmp-du "6.9 MB">
|
||||
<!ENTITY dejagnu-tmp-sbu "0.1 SBU">
|
||||
<!ENTITY dejagnu-tmp-sbu "менее 0.1 SBU">
|
||||
|
||||
<!ENTITY diffutils-version "3.10">
|
||||
<!ENTITY diffutils-size "1,587 KB">
|
||||
@ -216,7 +216,7 @@
|
||||
<!ENTITY gawk-tmp-du "47 MB">
|
||||
<!ENTITY gawk-tmp-sbu "0.1 SBU">
|
||||
<!ENTITY gawk-fin-du "42 MB">
|
||||
<!ENTITY gawk-fin-sbu "0.1 SBU">
|
||||
<!ENTITY gawk-fin-sbu "0.2 SBU">
|
||||
|
||||
<!ENTITY gcc-version "14.2.0">
|
||||
<!ENTITY gcc-size "90,144 KB">
|
||||
@ -381,7 +381,7 @@
|
||||
<!ENTITY less-fin-du "14 MB">
|
||||
<!ENTITY less-fin-sbu "менее 0.1 SBU">
|
||||
|
||||
<!ENTITY lfs-bootscripts-version "20240717"> <!-- Scripts depend on this format -->
|
||||
<!ENTITY lfs-bootscripts-version "20240825"> <!-- 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">
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"/>
|
||||
|
||||
@ -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. -->
|
||||
@ -97,7 +97,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
|
||||
|
||||
@ -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" -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
version="1.0">
|
||||
|
||||
<!-- This stylesheet contains misc params, attribute sets and templates
|
||||
for output formating.
|
||||
for output formatting.
|
||||
This file is for that templates that don't fit in other files. -->
|
||||
|
||||
<!-- What space do you want between normal paragraphs. -->
|
||||
@ -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">
|
||||
|
||||
@ -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"
|
||||
@ -243,7 +243,7 @@
|
||||
|
||||
<!-- page.number.format FOR ENGLISH
|
||||
We want roman numerals only in book's preface, not parts prefaces
|
||||
(if any). The original template is in {docbook-xsl}/fo/pagesetup.xsl
|
||||
(if any). The original template is in {docbook-xsl}/fo/pagesetup.xsl -->
|
||||
<xsl:template name="page.number.format">
|
||||
<xsl:param name="element" select="local-name(.)"/>
|
||||
<xsl:param name="master-reference" select="''"/>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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;')"/>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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*})
|
||||
|
||||
Loading…
Reference in New Issue
Block a user