diff options
| author | NeilBrown <neilb@suse.de> | 2019-10-30 10:32:41 +1100 |
|---|---|---|
| committer | Jes Sorensen <jsorensen@fb.com> | 2019-11-12 15:37:08 -0500 |
| commit | 4ca799c581703d4d0ad840833c037c2fff088ca7 (patch) | |
| tree | 137999bb393b979089645c89ebcc20d9bd7fe325 | |
| parent | 6636788aaf4ec0cacaefb6e77592e4a68e70a957 (diff) | |
| download | mdadm-4ca799c581703d4d0ad840833c037c2fff088ca7.tar.gz | |
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>
| -rw-r--r-- | systemd/mdcheck_continue.service | 5 | ||||
| -rw-r--r-- | 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 592c6079..deac6954 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 812141bb..f17f1aae 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} |