[flannel/f20] Do not use {} around FLANNEL_OPTIONS so one can pass more than 1 option

Eric Paris eparis at fedoraproject.org
Thu Mar 5 19:28:54 UTC 2015


commit 6afaaa2e60bf5b16f1eacda3080ea4202b40425f
Author: Eric Paris <eparis at redhat.com>
Date:   Thu Mar 5 14:19:40 2015 -0500

    Do not use {} around FLANNEL_OPTIONS so one can pass more than 1 option

 flanneld.service | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/flanneld.service b/flanneld.service
index d6eec2e..2c87a0b 100644
--- a/flanneld.service
+++ b/flanneld.service
@@ -7,8 +7,7 @@ After=network.target
 [Service]
 Type=notify
 EnvironmentFile=/etc/sysconfig/flanneld
-ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD} -etcd-prefix=${FLANNEL_ETCD_KEY} ${FLANNEL_OPTIONS}
-
+ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD} -etcd-prefix=${FLANNEL_ETCD_KEY} $FLANNEL_OPTIONS
 
 [Install]
 WantedBy=docker.service


More information about the scm-commits mailing list