From dc0f59d3b5575558c16f1205fb2bcd029311e36a Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 12 Jul 2016 12:29:49 -0700 Subject: [PATCH] app-admin/etcd-wrapper: add $ETCD_OPTS to ExecStart Passing arguments via this environment variable is more convenient than e.g. overriding the ExecStart line in a drop-in. --- ...tcd-wrapper-2.3.7-r1.ebuild => etcd-wrapper-2.3.7-r2.ebuild} | 0 ...tcd-wrapper-3.0.2-r1.ebuild => etcd-wrapper-3.0.2-r2.ebuild} | 0 .../app-admin/etcd-wrapper/files/etcd-wrapper.service.template | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/{etcd-wrapper-2.3.7-r1.ebuild => etcd-wrapper-2.3.7-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/{etcd-wrapper-3.0.2-r1.ebuild => etcd-wrapper-3.0.2-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-2.3.7-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-2.3.7-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-2.3.7-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-2.3.7-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.0.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.0.2-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.0.2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.0.2-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper.service.template b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper.service.template index e2d8021044..34302bf7cc 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper.service.template +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper.service.template @@ -7,7 +7,7 @@ Type=notify Environment=ETCD_NAME=%m Environment=ETCD_IMG_USER=etcd Environment="SOURCE_FILES={{SOURCE_FILES}}" -ExecStart=/usr/bin/etcd{{SLOT}}-wrapper +ExecStart=/usr/bin/etcd{{SLOT}}-wrapper $ETCD_OPTS Restart=always RestartSec=10s LimitNOFILE=40000