From 0000338e471960c581290628513b3240e69ec856 Mon Sep 17 00:00:00 2001 From: miaoguanqin Date: Fri, 2 Dec 2022 16:50:50 +0800 Subject: [PATCH] mdcheck_start.service mdcheck_continue.service will execute error, because the path of ExecStart /usr/share/mdadm/mdcheck is not exist. We change this path to /usr/sbin/mdcheck, so service will be execute correctly. (cherry picked from commit 5f5ca23c137d06ec3ef5d0c8e69f7c5d69049828) --- ...art.service-mdcheck_continue.service.patch | 37 +++++++++++++++++++ mdadm.spec | 6 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0004-mdadm-mdcheck_start.service-mdcheck_continue.service.patch diff --git a/0004-mdadm-mdcheck_start.service-mdcheck_continue.service.patch b/0004-mdadm-mdcheck_start.service-mdcheck_continue.service.patch new file mode 100644 index 0000000..82018f1 --- /dev/null +++ b/0004-mdadm-mdcheck_start.service-mdcheck_continue.service.patch @@ -0,0 +1,37 @@ +From c68df6f3ed2ab5de2148577e69cd5d58745985b3 Mon Sep 17 00:00:00 2001 +From: miaoguanqin +Date: Sat, 3 Dec 2022 10:36:55 +0800 +Subject: [PATCH] mdcheck_start.service and mdcheck_continue.service set the + path of Execstart to /usr/share/mdadm/mdcheck, But mdcheck was not exist in + this path. When we launch service, It would execute error. We change the path + of ExecStart to /usr/sbin/check, then service would br launched correctly. + +Signed-off-by: miaoguanqin +--- + systemd/mdcheck_continue.service | 2 +- + systemd/mdcheck_start.service | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/systemd/mdcheck_continue.service b/systemd/mdcheck_continue.service +index 854317f..935004b 100644 +--- a/systemd/mdcheck_continue.service ++++ b/systemd/mdcheck_continue.service +@@ -14,4 +14,4 @@ Type=oneshot + Environment="MDADM_CHECK_DURATION=6 hours" + EnvironmentFile=-/run/sysconfig/mdadm + ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh +-ExecStart=/usr/share/mdadm/mdcheck --continue --duration ${MDADM_CHECK_DURATION} ++ExecStart=BINDIR/mdcheck --continue --duration ${MDADM_CHECK_DURATION} +diff --git a/systemd/mdcheck_start.service b/systemd/mdcheck_start.service +index 3bb3d13..58d84c6 100644 +--- a/systemd/mdcheck_start.service ++++ b/systemd/mdcheck_start.service +@@ -14,4 +14,4 @@ Type=oneshot + Environment="MDADM_CHECK_DURATION=6 hours" + EnvironmentFile=-/run/sysconfig/mdadm + ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh +-ExecStart=/usr/share/mdadm/mdcheck --duration ${MDADM_CHECK_DURATION} ++ExecStart=BINDIR/mdcheck --duration ${MDADM_CHECK_DURATION} +-- +2.27.0 + diff --git a/mdadm.spec b/mdadm.spec index 657b400..c40ab8e 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-mdadm-mdcheck_start.service-mdcheck_continue.service.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 Dec 2 2022 miaoguanqin - 4.2-3 +- mdadmcheck_start.service mdadm_continue.service error + * Mon Nov 14 2022 Zhiqiang Liu - 4.2-2 - backport upstream bugfix patch to fix segfault problem -- Gitee