From e07304570735b5b2e80e9ca269611af7c07174ba Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Thu, 25 Jul 2013 09:40:58 -0700 Subject: [PATCH] Merge branch 'master' of https://github.com/coreos/coreos-overlay into oem-ami Conflicts: coreos-base/coreos/coreos-0.0.1-r196.ebuild coreos-base/coreos/coreos-0.0.1-r199.ebuild coreos-base/coreos/coreos-0.0.1-r200.ebuild coreos-base/coreos/coreos-0.0.1.ebuild coreos-base/oem-ami/files/install-ec2-key.sh --- .../coreos-base/oem-ami/files/install-ec2-key.sh | 3 +-- .../coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r4.ebuild | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/install-ec2-key.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/install-ec2-key.sh index 32f6e6b33e..a7cda709fa 100755 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/install-ec2-key.sh +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/install-ec2-key.sh @@ -8,8 +8,7 @@ if [ ! -d ${USER_DIR}/.ssh ] ; then mkdir -p ${USER_DIR}/.ssh chmod 700 ${USER_DIR}/.ssh fi -# Fetch public key using HTTP -curl -s --connect-timeout 3 http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /tmp/my-key +curl -s http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /tmp/my-key if [ $? -eq 0 ] ; then cat /tmp/my-key >> ${USER_DIR}/.ssh/authorized_keys chmod 700 ${USER_DIR}/.ssh/authorized_keys diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r4.ebuild new file mode 120000 index 0000000000..b1843e3373 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r4.ebuild @@ -0,0 +1 @@ +oem-ami-0.0.1.ebuild \ No newline at end of file