From bc525e53cd023fe9d300934c2bf8187857738730 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Wed, 17 Sep 2014 11:45:23 -0700 Subject: [PATCH] etcd: use machine-id as default name --- .../dev-db/etcd/{etcd-0.4.6-r1.ebuild => etcd-0.4.6-r2.ebuild} | 0 .../third_party/coreos-overlay/dev-db/etcd/files/etcd.service | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.4.6-r1.ebuild => etcd-0.4.6-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.6-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.6-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service index 2148f7956d..3e8c60b268 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service @@ -4,7 +4,8 @@ Description=etcd [Service] User=etcd PermissionsStartOnly=true -Environment=ETCD_DATA_DIR=/var/lib/etcd ETCD_NAME=default +Environment=ETCD_DATA_DIR=/var/lib/etcd +Environment=ETCD_NAME=%m ExecStart=/usr/bin/etcd Restart=always RestartSec=10s