You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.9 KiB
52 lines
1.9 KiB
4 years ago
|
From 4ca799c581703d4d0ad840833c037c2fff088ca7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: NeilBrown <neilb@suse.de>
|
||
|
|
Date: Wed, 30 Oct 2019 10:32:41 +1100
|
||
|
|
Subject: [RHEL7.8 PATCH V2 45/47] mdcheck: use ${} to pass variable to mdcheck
|
||
|
|
|
||
|
|
$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.7.5
|
||
|
|
|