From f763e5a6a9dbb75b500ef369bc9fae7b479c1d4b Mon Sep 17 00:00:00 2001 From: Xiao Ni Date: Tue, 30 Apr 2019 10:39:17 +0800 Subject: [PATCH 1/2] Update pidfile path to non legacy location This patch is from Christian Stadelmann Signed-off-by: Xiao Ni --- mdadm.spec | 6 +++++- mdmonitor.service | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mdadm.spec b/mdadm.spec index 12a2630..be2d136 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Name: mdadm Version: 4.1 %define subversion rc2 -Release: rc2.0.3%{?dist} +Release: rc2.0.4%{?dist} Summary: The mdadm program controls Linux md devices (software RAID arrays) URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ @@ -96,6 +96,10 @@ install -m644 %{SOURCE8} %{buildroot}/etc/libreport/events.d /etc/libreport/events.d/* %changelog +* Tue Apr 30 2019 Xiao Ni - 4.1-rc2.0.4 +- Update pidfile path to non legacy location +- Resolves bz1701114 + * Sat Mar 16 2019 Björn Esser - 4.1-rc2.0.3 - Add patch to build without -Werror, fixes FTBFS (#1675363) diff --git a/mdmonitor.service b/mdmonitor.service index 123ae8a..94618f1 100644 --- a/mdmonitor.service +++ b/mdmonitor.service @@ -4,7 +4,7 @@ ConditionPathExists=/etc/mdadm.conf [Service] Type=forking -PIDFile=/var/run/mdadm/mdadm.pid +PIDFile=/run/mdadm/mdadm.pid EnvironmentFile=-/etc/sysconfig/mdmonitor ExecStart=/sbin/mdadm --monitor --scan -f --pid-file=/var/run/mdadm/mdadm.pid From 2ef2be22916d199e1a5b3a406af54a5402426801 Mon Sep 17 00:00:00 2001 From: Xiao Ni Date: Tue, 4 Jun 2019 13:08:09 +0800 Subject: [PATCH 2/2] Change tmpfiles directory Resolves bz1716759 Signed-off-by: Xiao Ni --- mdadm.conf | 2 +- mdadm.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mdadm.conf b/mdadm.conf index 6200117..3207dda 100644 --- a/mdadm.conf +++ b/mdadm.conf @@ -1 +1 @@ -d /var/run/mdadm 0710 root root - +d /run/mdadm 0710 root root - diff --git a/mdadm.spec b/mdadm.spec index be2d136..ef8d88c 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Name: mdadm Version: 4.1 %define subversion rc2 -Release: rc2.0.4%{?dist} +Release: rc2.0.5%{?dist} Summary: The mdadm program controls Linux md devices (software RAID arrays) URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ @@ -96,6 +96,10 @@ install -m644 %{SOURCE8} %{buildroot}/etc/libreport/events.d /etc/libreport/events.d/* %changelog +* Tue Jun 04 2019 Xiao Ni - 4.1-rc2.0.5 +- Change tmpfiles directory to /run/mdadm in mdadm.conf +- Resolves bz1716759 + * Tue Apr 30 2019 Xiao Ni - 4.1-rc2.0.4 - Update pidfile path to non legacy location - Resolves bz1701114