diff --git a/0004-fix-mdmonitor-oneshot.service-start-error.patch b/0004-fix-mdmonitor-oneshot.service-start-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..ee59bbaf3c1f4558e8b08ac04e5f739c2c21ff51 --- /dev/null +++ b/0004-fix-mdmonitor-oneshot.service-start-error.patch @@ -0,0 +1,25 @@ +From 40d214fc77bd5264f9bbca9c1ff88a55e2f72b33 Mon Sep 17 00:00:00 2001 +From: miaoguanqin +Date: Fri, 9 Jun 2023 10:43:53 +0800 +Subject: [PATCH] fix mdmonitor-oneshot.service start error + +--- + systemd/mdmonitor-oneshot.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/mdmonitor-oneshot.service b/systemd/mdmonitor-oneshot.service +index 373955a..5393b8f 100644 +--- a/systemd/mdmonitor-oneshot.service ++++ b/systemd/mdmonitor-oneshot.service +@@ -9,7 +9,7 @@ + Description=Reminder for degraded MD arrays + + [Service] +-Environment=MDADM_MONITOR_ARGS=--scan ++Environment=MDADM_MONITOR_ARGS="--scan --syslog" + EnvironmentFile=-/run/sysconfig/mdadm + ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh + ExecStart=BINDIR/mdadm --monitor --oneshot $MDADM_MONITOR_ARGS +-- +2.27.0 + diff --git a/mdadm.spec b/mdadm.spec index 657b400f4b139e0085431573c6e7cb336373ba94..37a972912f934bf42581b55cf1770905c5b99ac5 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,6 +1,6 @@ Name: mdadm Version: 4.2 -Release: 2 +Release: 3 Summary: The software RAID arrays user manage tools License: GPLv2+ URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ @@ -13,6 +13,7 @@ Source3: mdadm.conf Patch1: 0001-mdadm-remove-Werror-to-fix-Werror-address-of-packed-.patch Patch2: 0002-mdadm-Fix-mdadm-r-remove-option-regresision.patch Patch3: 0003-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch +Patch4: 0004-fix-mdmonitor-oneshot.service-start-error.patch BuildRequires: systemd gcc binutils libudev-devel Requires(post): systemd coreutils @@ -78,6 +79,9 @@ install -d -m 710 %{buildroot}/var/run/mdadm/ %{_mandir}/man*/* %changelog +* Fri Jun 9 2023 miaoguanqin - 4.2-3 +- fix mdmonitor-oneshot start failed + * Mon Nov 14 2022 Zhiqiang Liu - 4.2-2 - backport upstream bugfix patch to fix segfault problem