From 0dfd2ec65eaab1a6ae3abf3ad61b35edb1dfe66f Mon Sep 17 00:00:00 2001 From: Duffie Cooley Date: Wed, 18 Oct 2017 09:46:43 -0700 Subject: [PATCH] app-admin/etcd-wrapper: Address etcd-member race. In some cases etcd is able to start before systemd-resolved has populated the /etc/resolv.conf file. This commit addresses this by adding a dependency on netowrk-online.target. This will ensure that systemd-resolved finishes it's work before etcd-member.service starts. --- ...{etcd-wrapper-3.2.7.ebuild => etcd-wrapper-3.2.7-r1.ebuild} | 0 .../app-admin/etcd-wrapper/files/etcd-member.service | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/{etcd-wrapper-3.2.7.ebuild => etcd-wrapper-3.2.7-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.2.7.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.2.7-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.2.7.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.2.7-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-member.service b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-member.service index 319e7ff55b..dc02e4965b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-member.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-member.service @@ -1,7 +1,8 @@ [Unit] Description=etcd (System Application Container) Documentation=https://github.com/coreos/etcd -Wants=network.target +Wants=network-online.target network.target +After=network-online.target Conflicts=etcd.service Conflicts=etcd2.service