1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 4ca799c581703d4d0ad840833c037c2fff088ca7 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.de>
|
|
Date: Wed, 30 Oct 2019 10:32:41 +1100
|
|
Subject: [PATCH] mdcheck: use ${} to pass variable to mdcheck
|
|
Git-commit: 4ca799c581703d4d0ad840833c037c2fff088ca7
|
|
Patch-mainline: mdadm-4.1+
|
|
References: bsc#1153258
|
|
|
|
$MDADM_CHECK_DURATION allows the value to be split on spaces.
|
|
${MDADM_CHECK_DURATION} avoids such splitting.
|
|
|
|
Making this change removes the need for double quoting when setting
|
|
the default Environment, and means that double quoting isn't needed
|
|
in the EnvironmentFile.
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
systemd/mdcheck_continue.service | 5 ++---
|
|
systemd/mdcheck_start.service | 4 ++--
|
|
2 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/systemd/mdcheck_continue.service b/systemd/mdcheck_continue.service
|
|
index 592c607..deac695 100644
|
|
--- a/systemd/mdcheck_continue.service
|
|
+++ b/systemd/mdcheck_continue.service
|
|
@@ -11,8 +11,7 @@ ConditionPathExistsGlob = /var/lib/mdcheck/MD_UUID_*
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
-Environment= MDADM_CHECK_DURATION='"6 hours"'
|
|
+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=/usr/share/mdadm/mdcheck --continue --duration ${MDADM_CHECK_DURATION}
|
|
diff --git a/systemd/mdcheck_start.service b/systemd/mdcheck_start.service
|
|
index 812141b..f17f1aa 100644
|
|
--- a/systemd/mdcheck_start.service
|
|
+++ b/systemd/mdcheck_start.service
|
|
@@ -11,7 +11,7 @@ Wants=mdcheck_continue.timer
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
-Environment= MDADM_CHECK_DURATION='"6 hours"'
|
|
+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=/usr/share/mdadm/mdcheck --duration ${MDADM_CHECK_DURATION}
|
|
--
|
|
2.25.0
|
|
|