Changeset f780602

Timestamp:

06/09/2021 03:45:10 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

6a72404

Parents:

e3835ac (diff), 25596ffb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• bootscripts/ChangeLog (modified) (2 diffs)
• bootscripts/lfs/init.d/network (modified) (2 diffs)
• chapter01/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

bootscripts/ChangeLog

@@ +1 @@
+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
@@ -6 +10 @@
    * 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>

bootscripts/lfs/init.d/network

@@ -36 +36 @@
 
          # Skip if $file is * (because nothing was found)
-         if [ "${interface}" = "*" ]
-         then
-            continue
-         fi
+         if [ "${interface}" = "*" ]; then continue; fi
 
          /sbin/ifup ${interface}
@@ -62 +59 @@
 
          # 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}

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <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

@@ -385 +385 @@
 <!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">