gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-02-08 15:23:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2021-06-09 05:45:10 +02:00
commit f780602ae9
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootscripts/ChangeLog
View File

@ -1,3 +1,7 @@
2021-06-08 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* When shutting down the network, ignore invalid interfaces
or interfaces that are not UP.
2021-06-02 Thomas Trepl <thomas@linuxfromscratch.org> 2021-06-02 Thomas Trepl <thomas@linuxfromscratch.org>
* Prevent sendsignals from killing an active mdmon * Prevent sendsignals from killing an active mdmon
@ -5,7 +9,7 @@
* Make check_signal more robust. * Make check_signal more robust.
* Use a better methog for killproc to remove a dead pid file. * Use a better methog for killproc to remove a dead pid file.
* Clarify what signals killproc accepts. * Clarify what signals killproc accepts.
* Thanks to input an ddiscussion from Scott Andrews. * Thanks to input and discussion from Scott Andrews.
2021-02-01 Bruce Dubbs <bdubbs@linuxfromscratch.org> 2021-02-01 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* Tweak mountfs to properly exit when an error is found. * Tweak mountfs to properly exit when an error is found.

17
bootscripts/lfs/init.d/network
View File

@ -35,10 +35,7 @@ case "${1}" in
interface=${file##*/ifconfig.} interface=${file##*/ifconfig.}
# Skip if $file is * (because nothing was found) # Skip if $file is * (because nothing was found)
if [ "${interface}" = "*" ] if [ "${interface}" = "*" ]; then continue; fi
then
continue
fi
/sbin/ifup ${interface} /sbin/ifup ${interface}
done done
@ -61,10 +58,14 @@ case "${1}" in
interface=${file##*/ifconfig.} interface=${file##*/ifconfig.}
# Skip if $file is * (because nothing was found) # Skip if $file is * (because nothing was found)
if [ "${interface}" = "*" ] if [ "${interface}" = "*" ]; then continue; fi
then
continue # See if interface exists
fi if [ ! -e /sys/class/net/$interface ]; then continue; fi
# Is interface UP?
ip link show $interface 2>/dev/null | grep -q "state UP"
if [ $? -ne 0 ]; then continue; fi
/sbin/ifdown ${interface} /sbin/ifdown ${interface}
done done

9
chapter01/changelog.xml
View File

@ -44,6 +44,15 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as <listitem revision="sysv"> or <listitem revision="systemd"> as
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 revision="sysv">
<para>2021-06-08</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Make shutting down the netwrok more robust.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem revision="sysv"> <listitem revision="sysv">
<para>2021-06-02</para> <para>2021-06-02</para>
<itemizedlist> <itemizedlist>

2
packages.ent
View File

@ -384,7 +384,7 @@
<!ENTITY less-fin-du "4.1 MB"> <!ENTITY less-fin-du "4.1 MB">
<!ENTITY less-fin-sbu "less than 0.1 SBU"> <!ENTITY less-fin-sbu "less than 0.1 SBU">
<!ENTITY lfs-bootscripts-version "20210602"> <!-- Scripts depend on this format --> <!ENTITY lfs-bootscripts-version "20210608"> <!-- 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">