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
This commit is contained in:
Alex Polvi 2013-07-25 09:40:58 -07:00 committed by Brandon Philips
parent 3d4a8899e5
commit e073045707
2 changed files with 2 additions and 2 deletions

View File

@ -8,8 +8,7 @@ if [ ! -d ${USER_DIR}/.ssh ] ; then
mkdir -p ${USER_DIR}/.ssh mkdir -p ${USER_DIR}/.ssh
chmod 700 ${USER_DIR}/.ssh chmod 700 ${USER_DIR}/.ssh
fi fi
# Fetch public key using HTTP curl -s http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /tmp/my-key
curl -s --connect-timeout 3 http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /tmp/my-key
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
cat /tmp/my-key >> ${USER_DIR}/.ssh/authorized_keys cat /tmp/my-key >> ${USER_DIR}/.ssh/authorized_keys
chmod 700 ${USER_DIR}/.ssh/authorized_keys chmod 700 ${USER_DIR}/.ssh/authorized_keys

View File

@ -0,0 +1 @@
oem-ami-0.0.1.ebuild