!63 [sync] PR-60: fix mdmonitor=oneshot.service start failed

From: @openeuler-sync-bot 
Reviewed-by: @swf504 
Signed-off-by: @swf504
This commit is contained in:
openeuler-ci-bot 2023-06-09 08:24:51 +00:00 committed by Gitee
commit 8356356b39
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 40d214fc77bd5264f9bbca9c1ff88a55e2f72b33 Mon Sep 17 00:00:00 2001
From: miaoguanqin <miaoguanqin@huawei.com>
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

View File

@ -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 <miaoguanqin@huawei.com> - 4.2-8
* fix mdmonitor-oneshot.service
* Mon Apr 24 2023 tangyuchen <tangyuchen5@huawei.com> - 4.2-7
* fix crond cannot find command mdadm