Changeset 5d6b72b

Timestamp:

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

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

f57735e

Parents:

5f76506 (diff), 9804e16 (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) (1 diff)
• bootscripts/lfs/init.d/sendsignals (modified) (2 diffs)
• chapter01/changelog.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)

bootscripts/ChangeLog

@@ +1 @@
+2021-06-02 Thomas Trepl <thomas@linuxfromscratch.org>
+   * Prevent sendsignals from killing an active mdmon
+
 2021-04-28 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Make check_signal more robust. 

bootscripts/lfs/init.d/sendsignals

@@ -30 +30 @@
 case "${1}" in
    stop)
+      omit=$(pidof mdmon)
+      [ -n "$omit" ] && omit="-o $omit"
+
       log_info_msg "Sending all processes the TERM signal..."
-      killall5 -15
+      killall5 -15 $omit
       error_value=${?}
 
@@ -43 +46 @@
 
       log_info_msg "Sending all processes the KILL signal..."
-      killall5 -9
+      killall5 -9 $omit
       error_value=${?}
 

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <listitem>
+      <para>2021-06-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Tweak sendsignal bootscript to avoid
+            killing mdmod (if active).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-05-31</para>
       <itemizedlist>

packages.ent

@@ -230 +230 @@
 <!ENTITY gcc-fin-sbu "95 SBU (with tests)">
 <!ENTITY libquadmath-version "0.0.0">
-<!ENTITY libstdcpp-version   "6.0.28">
+<!ENTITY libstdcpp-version   "6.0.29">
 <!ENTITY libitm-version      "1.0.0">
 <!ENTITY libatomic-version   "1.2.0">
@@ -385 +385 @@
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20210428">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20210602">      <!-- 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">