Changeset 25596ffb

Timestamp:

06/08/2021 05:31:17 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

c36301e7, f780602

Parents:

06cdaed

Message:

Make stopping the network interfaces more robust.
SysV only.

When stopping or rebooting the system, the network boot script is run and looks
at all the /etc/sysconfig/ifconfig.* files. Some of the devices these files
refer to may not be active or even refer to interfaces that are not defined on
the current system. This change ignores non-existant interfaces and any
interfaces that are not UP. This change also avoids bogus warning or error
error messages when the system is shutting down.

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

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

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