From 510db2b9582880708a77212ebfc8f5f65cd9602a Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Mon, 30 Mar 2015 16:07:42 -0700
Subject: [PATCH] dev-db/etcd: write all v2 files from ebuild

Remove etcd-migrate and etcd-dump-logs
---
 .../{etcd-2.0.8.ebuild => etcd-2.0.8-r1.ebuild}     |  0
 .../coreos-overlay/dev-db/etcd/etcd-9999.ebuild     | 13 ++++---------
 .../coreos-overlay/dev-db/etcd/files/etcd2.conf     |  1 +
 .../coreos-overlay/dev-db/etcd/files/etcd2.service  | 11 +++++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-2.0.8.ebuild => etcd-2.0.8-r1.ebuild} (100%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf
 create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
index e902517c36..00f46f5eb2 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
@@ -9,7 +9,7 @@ CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/etcd"
-inherit coreos-doc coreos-go toolchain-funcs cros-workon
+inherit coreos-doc coreos-go toolchain-funcs cros-workon systemd
 
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64"
@@ -33,19 +33,14 @@ RDEPEND="!dev-db/etcd:0
 src_compile() {
 	go_build "${COREOS_GO_PACKAGE}"
 	go_build "${COREOS_GO_PACKAGE}/etcdctl"
-	go_build "${COREOS_GO_PACKAGE}/tools/etcd-migrate"
-	go_build "${COREOS_GO_PACKAGE}/tools/etcd-dump-logs"
 }
 
 src_install() {
-	local libexec="libexec/${PN}/internal_versions/${SLOT}"
-
 	dobin ${WORKDIR}/gopath/bin/etcdctl
-	dobin ${WORKDIR}/gopath/bin/etcd-migrate
-	dobin ${WORKDIR}/gopath/bin/etcd-dump-logs
+	newbin "${WORKDIR}/gopath/bin/${PN}" "${PN}${SLOT}"
 
-	exeinto "/usr/${libexec}"
-	doexe "${WORKDIR}/gopath/bin/${PN}"
+	systemd_dounit "${FILESDIR}/${PN}${SLOT}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}${SLOT}.conf"
 
 	coreos-dodoc -r Documentation/*
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf
new file mode 100644
index 0000000000..d8bfc78710
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf
@@ -0,0 +1 @@
+d    /var/lib/etcd2 0755 etcd etcd - -
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service
new file mode 100644
index 0000000000..bd1acc36b1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=etcd2
+Conflicts=etcd.service
+
+[Service]
+User=etcd
+Environment=ETCD_DATA_DIR=/var/lib/etcd2
+ExecStart=/usr/bin/etcd2
+Restart=always
+RestartSec=10s
+LimitNOFILE=40000