From 07d7ce3c281d66a46a15d5053e5e6c555a608503 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 1 Apr 2014 16:21:55 -0700 Subject: [PATCH 1/2] fix(app-admin/fleet): Add service dependency on etcd. Fleet without etcd isn't particularly useful. Make sure it starts to avoid the usual surprises from new users. No need for strict ordering. --- .../coreos-overlay/app-admin/fleet/files/fleet.service | 1 + .../fleet/{fleet-0.1.4.ebuild => fleet-0.1.4-r1.ebuild} | 0 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/app-admin/fleet/{fleet-0.1.4.ebuild => fleet-0.1.4-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service index 84acbcd739..82d2bcc979 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service @@ -1,5 +1,6 @@ [Unit] Description=fleet +Wants=etcd.service [Service] ExecStart=/usr/bin/fleet diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.1.4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.1.4-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.1.4.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.1.4-r1.ebuild From a983283c03df5e64496672b6bb3a8f4c1e83caf0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 1 Apr 2014 16:27:45 -0700 Subject: [PATCH 2/2] fix(dev-db/etcd): Re-add [Install] section to service file. This was needlessly removed in 03be5aef, required for configuring etcd to start via `systemctl enable etcd.service`. --- .../dev-db/etcd/{etcd-0.3.0-r8.ebuild => etcd-0.3.0-r9.ebuild} | 0 .../third_party/coreos-overlay/dev-db/etcd/files/etcd.service | 3 +++ 2 files changed, 3 insertions(+) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.3.0-r8.ebuild => etcd-0.3.0-r9.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r8.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r9.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..104c89ea1e 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 @@ -8,3 +8,6 @@ Environment=ETCD_DATA_DIR=/var/lib/etcd ETCD_NAME=default ExecStart=/usr/bin/etcd Restart=always RestartSec=10s + +[Install] +WantedBy=multi-user.target