aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-09-04 16:32:54 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-09-04 16:32:54 -0400
commit689585a7d7d69cf04b5061cd60ae34405cfe4637 (patch)
tree7d9e82d4c8c39535e00d7b0ace2bc72a2190910e
parentc63d2e96efdf2a413b3cea37f85a6bb8186c0bc7 (diff)
downloadgrokmirror-689585a7d7d69cf04b5061cd60ae34405cfe4637.tar.gz
Fix service files variable expansion
Systemd treats $FOO and ${FOO} slightly differently, so use the correct version that doesn't get tripped up on whitespace. Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rw-r--r--contrib/grok-fsck@.service2
-rw-r--r--contrib/grok-pull@.service2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/grok-fsck@.service b/contrib/grok-fsck@.service
index f6badad..246162c 100644
--- a/contrib/grok-fsck@.service
+++ b/contrib/grok-fsck@.service
@@ -7,7 +7,7 @@ Type=oneshot
Environment="EXTRA_FSCK_OPTS="
EnvironmentFile=-/etc/sysconfig/grokmirror.default
EnvironmentFile=-/etc/sysconfig/grokmirror.%i
-ExecStart=/usr/bin/grok-fsck -c /etc/grokmirror/%i.conf ${EXTRA_FSCK_OPTS}
+ExecStart=/usr/bin/grok-fsck -c /etc/grokmirror/%i.conf $EXTRA_FSCK_OPTS
CPUSchedulingPolicy=batch
# To override these users, create a drop-in systemd conf file in
# /etc/systemd/system/grok-fsck@[foo].service.d/10-usergroup.conf:
diff --git a/contrib/grok-pull@.service b/contrib/grok-pull@.service
index 9d40f2c..e17d6f2 100644
--- a/contrib/grok-pull@.service
+++ b/contrib/grok-pull@.service
@@ -7,7 +7,7 @@ Documentation=https://github.com/mricon/grokmirror
Environment="EXTRA_PULL_OPTS="
EnvironmentFile=-/etc/sysconfig/grokmirror.default
EnvironmentFile=-/etc/sysconfig/grokmirror.%i
-ExecStart=/usr/bin/grok-pull -o -c /etc/grokmirror/%i.conf ${EXTRA_PULL_OPTS}
+ExecStart=/usr/bin/grok-pull -o -c /etc/grokmirror/%i.conf $EXTRA_PULL_OPTS
Type=simple
Restart=on-failure
# To override these users, create a drop-in systemd conf file in