Automatic merge of trunk into multilib

bootscripts/ChangeLog

@@ -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>
    * Prevent sendsignals from killing an active mdmon
 
@@ -5,7 +9,7 @@
    * Make check_signal more robust. 
    * Use a better methog for killproc to remove a dead pid file.
    * 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>
    * Tweak mountfs to properly exit when an error is found.

bootscripts/lfs/init.d/network

@@ -35,10 +35,7 @@ case "${1}" in
          interface=${file##*/ifconfig.}
 
          # Skip if $file is * (because nothing was found)
-         if [ "${interface}" = "*" ]
-         then
-            continue
-         fi
+         if [ "${interface}" = "*" ]; then continue; fi
 
          /sbin/ifup ${interface}
       done
@@ -61,10 +58,14 @@ case "${1}" in
          interface=${file##*/ifconfig.}
 
          # Skip if $file is * (because nothing was found)
-         if [ "${interface}" = "*" ]
-         then
-            continue
-         fi
+         if [ "${interface}" = "*" ]; then continue; fi
+
+         # See if interface exists
+         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}
       done

chapter01/changelog.xml

@@ -44,6 +44,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     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">
       <para>2021-06-02</para>
       <itemizedlist>

packages.ent

@@ -384,7 +384,7 @@
 <!ENTITY less-fin-du "4.1 MB">
 <!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-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">