From 7f460a65cdfe1348e5bde1b98d04c787b020f91b Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Fri, 14 Mar 2014 05:55:21 +0000 Subject: [PATCH 1/2] add sed per marineam --- .../coreos-base/oem-ami/files/coreos-setup-environment | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-setup-environment index f00248a150..dfbae79f9e 100755 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-setup-environment +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-setup-environment @@ -13,6 +13,10 @@ if [ $? -ne 0 ]; then exit 1 fi +sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \ + -e '/^COREOS_PRIVATE_IPV4=/d' \ + "${ENV}" + # get public ip from metadata PUB_IP_URL=http://169.254.169.254/latest/meta-data/public-ipv4 IP=$(/usr/bin/curl --fail -s "$PUB_IP_URL") From 4f476c92e13d78e43b926982cb82bb7c8778903c Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Fri, 14 Mar 2014 05:59:41 +0000 Subject: [PATCH 2/2] bump init --- ...oreos-init-0.0.1-r45.ebuild => coreos-init-0.0.1-r65.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-r45.ebuild => coreos-init-0.0.1-r65.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r45.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r65.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r45.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r65.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 9758257d34..651260b151 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="bdb72dcffba17d34aea6e6df7f64678bf6003147" + CROS_WORKON_COMMIT="7c6fe6641171e1d07f038f31ed4120ab19ea2c49" KEYWORDS="amd64 arm x86" fi