Add Killmode=none for mdmon systemd service

Resolves: rhbz#2109042

Signed-off-by: Xiao Ni <xni@redhat.com>

0012-mdadm-systemd-remove-KillMode-none-from-service-file.patch

@@ -1,69 +0,0 @@
-From 52c67fcdd6dadc4138ecad73e65599551804d445 Mon Sep 17 00:00:00 2001
-From: Coly Li <colyli@suse.de>
-Date: Tue, 15 Feb 2022 21:34:15 +0800
-Subject: [PATCH 12/12] mdadm/systemd: remove KillMode=none from service file
-
-For mdadm's systemd configuration, current systemd KillMode is "none" in
-following service files,
-- mdadm-grow-continue@.service
-- mdmon@.service
-
-This "none" mode is strongly againsted by systemd developers (see man 5
-systemd.kill for "KillMode=" section), and is considering to remove in
-future systemd version.
-
-As systemd developer explained in disuccsion, the systemd kill process
-is,
-1. send the signal specified by KillSignal= to the list of processes (if
-   any), TERM is the default
-2. wait until either the target of process(es) exit or a timeout expires
-3. if the timeout expires send the signal specified by FinalKillSignal=,
-   KILL is the default
-
-For "control-group", all remaining processes will receive the SIGTERM
-signal (by default) and if there are still processes after a period f
-time, they will get the SIGKILL signal.
-
-For "mixed", only the main process will receive the SIGTERM signal, and
-if there are still processes after a period of time, all remaining
-processes (including the main one) will receive the SIGKILL signal.
-
-From the above comment, currently KillMode=control-group is a proper
-kill mode. Since control-gropu is the default kill mode, the fix can be
-simply removing KillMode=none line from the service file, then the
-default mode will take effect.
-
-Signed-off-by: Coly Li <colyli@suse.de>
-Cc: Benjamin Brunner <bbrunner@suse.com>
-Cc: Franck Bui <fbui@suse.de>
-Cc: Jes Sorensen <jes@trained-monkey.org>
-Cc: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Cc: Neil Brown <neilb@suse.de>
-Cc: Xiao Ni <xni@redhat.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- systemd/mdadm-grow-continue@.service | 1 -
- systemd/mdmon@.service               | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/systemd/mdadm-grow-continue@.service b/systemd/mdadm-grow-continue@.service
-index 5c667d2a..9fdc8ec7 100644
---- a/systemd/mdadm-grow-continue@.service
-+++ b/systemd/mdadm-grow-continue@.service
-@@ -14,4 +14,3 @@ ExecStart=BINDIR/mdadm --grow --continue /dev/%I
- StandardInput=null
- StandardOutput=null
- StandardError=null
--KillMode=none
-diff --git a/systemd/mdmon@.service b/systemd/mdmon@.service
-index 85a3a7c5..77533958 100644
---- a/systemd/mdmon@.service
-+++ b/systemd/mdmon@.service
-@@ -25,4 +25,3 @@ Type=forking
- # it out) and systemd will remove it when transitioning from
- # initramfs to rootfs.
- #PIDFile=/run/mdadm/%I.pid
--KillMode=none
--- 
-2.31.1
-

mdadm.spec

@@ -1,7 +1,7 @@
 Name:        mdadm
 Version:     4.2
 # extraversion is used to define rhel internal version
-%define extraversion 3
+%define extraversion 4
 Release:     %{extraversion}%{?dist}
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
@@ -31,7 +31,6 @@ Patch09:    0008-mdadm-Update-config-man-regarding-default-files-and-.patch
 Patch10:    0009-mdadm-Update-config-manual.patch
 Patch11:    0010-Create-Build-use-default_layout.patch
 Patch12:    0011-mdadm-add-map_num_s.patch
-Patch13:    0012-mdadm-systemd-remove-KillMode-none-from-service-file.patch
 
 # Fedora customization patches
 Patch97:    mdadm-3.3-udev.patch
@@ -105,6 +104,10 @@ install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d
 /etc/libreport/events.d/*
 
 %changelog
+* Wed Aug 10 2022 Xiao Ni <xni@redhat.com> - 4.2-4
+- Add Killmode=none for mdmon systemd service again
+- Resolves rhbz#2109042
+
 * Mon May 30 2022 Xiao Ni <xni@redhat.com> - 4.2-3
 - Update mdadm to latest upstream
 - Resolves rhbz#2052029, rhbz#1974184