From 3942ea6f2160fca6e0683146fed2390c45eabbf1 Mon Sep 17 00:00:00 2001 From: miaoguanqin Date: Fri, 9 Jun 2023 11:05:03 +0800 Subject: [PATCH] fix mdmonitor-oneshot.service start failed --- ...dmonitor-oneshot.service-start-error.patch | 25 +++++++++++++++++++ mdadm.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0009-fix-mdmonitor-oneshot.service-start-error.patch diff --git a/0009-fix-mdmonitor-oneshot.service-start-error.patch b/0009-fix-mdmonitor-oneshot.service-start-error.patch new file mode 100644 index 0000000..ee59bba --- /dev/null +++ b/0009-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 c9e6e37..f3b7618 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,6 +1,6 @@ Name: mdadm Version: 4.2 -Release: 7 +Release: 8 Summary: The software RAID arrays user manage tools License: GPLv2+ URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ @@ -18,6 +18,7 @@ Patch5: 0005-Fix-possible-NULL-ptr-dereferences-and-memory-leaks.patch Patch6: 0006-mdadm-Don-t-open-md-device-for-CREATE-and-ASSEMBLE.patch Patch7: 0007-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch Patch8: 0008-fix-NULL-dereference-in-super_by_fd.patch +Patch9: 0009-fix-mdmonitor-oneshot.service-start-error.patch BuildRequires: systemd gcc binutils libudev-devel Requires(post): systemd coreutils @@ -83,6 +84,9 @@ install -d -m 710 %{buildroot}/var/run/mdadm/ %{_mandir}/man*/* %changelog +* Fri Jun 9 2023 miaoguanqin - 4.2-8 +* fix mdmonitor-oneshot.service + * Mon Apr 24 2023 tangyuchen - 4.2-7 * fix crond cannot find command mdadm -- Gitee