From d0c36c292b1174640bdc3ac3e0d29ca6a5fc5c5e Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 1 Jul 2014 11:53:11 -0700 Subject: [PATCH] coreos-init: remove default coreos-setup-environment The coreos-setup-environment script can now only be provided by OEMs, the default script that used to run when the OEM didn't provide one was not smart enough to wait for networking to be configured before writing out /etc/environment *but* we cannot simply add such a wait because that would make it impossible for users to use cloud config in configdrive or similar to configure static networking. Longer term coreos-cloudinit will replace at least some of the current OEM coreos-setup-environment scripts and perhaps eventually integrate with networkd to cover the default case reasonably well. Sorting this out is still ongoing. (This ebuild bump was supposed to land a week ago but we missed it.) --- ...oreos-init-0.0.1-r90.ebuild => coreos-init-0.0.1-r91.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r90.ebuild => coreos-init-0.0.1-r91.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r90.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r91.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r90.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r91.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 810ea418ff..92048ee64b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="a4c3267c680a46b110533fb3a5e22048ea386218" + CROS_WORKON_COMMIT="958722d032e07ba80a249d31570b14b7b57ff1ee" KEYWORDS="amd64 arm x86" fi