From: NeilBrown Date: Tue, 29 Oct 2019 23:32:41 +0000 (+1100) Subject: mdcheck: use ${} to pass variable to mdcheck X-Git-Tag: mdadm-4.2-rc1~88 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ca799c581703d4d0ad840833c037c2fff088ca7;p=thirdparty%2Fmdadm.git 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 Signed-off-by: Jes Sorensen --- 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}