gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2024-08-25 14:49:38 +02:00
commit 1d6a2e2289
7 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bootscripts/ChangeLog
View File

@ -1,3 +1,10 @@
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> 2024-08-23 Xi Ruoyao <xry111@xry111.site>
* In console, detect FB console by checking /sys/class/graphics/fbcon * In console, detect FB console by checking /sys/class/graphics/fbcon
instead of fb0. The latter does not exist if CONFIG_FB=n, but instead of fb0. The latter does not exist if CONFIG_FB=n, but

3
bootscripts/lfs/lib/services/init-functions
View File

@ -457,11 +457,8 @@ pidofproc()
# If a PID file is set and exists, use it. # If a PID file is set and exists, use it.
if [ -n "${pidfile}" -a -e "${pidfile}" ]; then if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
# Use the value in the first line of the pidfile # Use the value in the first line of the pidfile
pidlist=`/bin/head -n1 "${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 else
# Use pidof # Use pidof
pidlist=`pidof "${program}"` pidlist=`pidof "${program}"`

8
bootscripts/lfs/sbin/ifup.8
View File

@ -94,7 +94,7 @@ NOTES
compound device such as a bridge. compound device such as a bridge.
ONBOOT - If set to 'yes', the specified interface is 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 GATEWAY - The default IP address to use for routing if
the destination IP address is not in a static the destination IP address is not in a static
@ -112,7 +112,7 @@ NOTES
This list is normally a single value, e.g. eth0, This list is normally a single value, e.g. eth0,
for use with a virtual host such as kvm. 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 ipv4-static
@ -128,7 +128,7 @@ NOTES
additional IP addresses to a network additional IP addresses to a network
device. Example: eth0:2 (optional) 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, e.g 192.168.1.255. If not specified,
the broadcast address will be calculated the broadcast address will be calculated
from the IP and PREFIX. from the IP and PREFIX.
@ -154,7 +154,7 @@ NOTES
DHCP_START - Optional parameters to pass to the dhcp client DHCP_START - Optional parameters to pass to the dhcp client
at startup. at startup.
DHCP_STOP - Optional paremeters to pass to the dhcp client DHCP_STOP - Optional parameters to pass to the dhcp client
at shutdown. at shutdown.
PRINTIP - Flag to print the dhcp address to stdout PRINTIP - Flag to print the dhcp address to stdout

10
chapter01/changelog.xml
View File

@ -40,6 +40,16 @@
appropriate for the entry or if needed the entire day's listitem. 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> <listitem>
<para>2024-08-23</para> <para>2024-08-23</para>
<itemizedlist> <itemizedlist>

2
git-version.sh
View File

@ -19,7 +19,7 @@ if [ -e LFS-RELEASE ]; then
fi fi
if ! git status > /dev/null; then 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. # Just workaround.
echo "<![ %sysv; [" > version.ent echo "<![ %sysv; [" > version.ent
echo "<!ENTITY version \"unknown\">" >> version.ent echo "<!ENTITY version \"unknown\">" >> version.ent

2
packages.ent
View File

@ -391,7 +391,7 @@
<!ENTITY less-fin-du "14 MB"> <!ENTITY less-fin-du "14 MB">
<!ENTITY less-fin-sbu "less than 0.1 SBU"> <!ENTITY less-fin-sbu "less than 0.1 SBU">
<!ENTITY lfs-bootscripts-version "20240823"> <!-- 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-size "BOOTSCRIPTS-SIZE KB">
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz"> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">

2
stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
View File

@ -5,7 +5,7 @@
version="1.0"> version="1.0">
<!-- This stylesheet contains misc params, attribute sets and templates <!-- 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. --> This file is for that templates that don't fit in other files. -->
<!-- What space do you want between normal paragraphs. --> <!-- What space do you want between normal paragraphs. -->