From 8e35b98ac44efef506eadbaeaf89d0a461a430e3 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Thu, 6 Sep 2018 13:16:39 -0700 Subject: [PATCH] coreos-base/oem-gce: avoid dep loops with oslogin Set DefaultDependencies=false for oem-gce-enable-oslogin.service to avoid dependency loops. --- .../oem-gce/files/units/oem-gce-enable-oslogin.service | 3 ++- .../{oem-gce-20180823.ebuild => oem-gce-20180823-r1.ebuild} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/{oem-gce-20180823.ebuild => oem-gce-20180823-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce-enable-oslogin.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce-enable-oslogin.service index ae2e1ffca3..a008b9cd15 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce-enable-oslogin.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce-enable-oslogin.service @@ -1,7 +1,8 @@ [Unit] Description=Enable GCE OS Login -After=local-fs.target ConditionFirstBoot=true +DefaultDependencies=false +After=local-fs.target Before=sshd.service Before=sshd.socket diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r1.ebuild