From 14454b0cec294c935d575c8df764793de1504e29 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 12 Aug 2013 19:05:00 -0400 Subject: [PATCH] fix(coreos-base/oem-vagrant): No need for run.sh for copying ssh key. Copying authorized_keys is now built in to coreos-init. --- .../files/{vagrant.pub => authorized_keys} | 0 .../coreos-base/oem-vagrant/files/run.sh | 17 ----------------- .../oem-vagrant/oem-vagrant-0.0.1-r1.ebuild | 1 + .../oem-vagrant/oem-vagrant-0.0.1.ebuild | 5 +---- 4 files changed, 2 insertions(+), 21 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/{vagrant.pub => authorized_keys} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/run.sh create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/vagrant.pub b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/authorized_keys similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/vagrant.pub rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/authorized_keys diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/run.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/run.sh deleted file mode 100644 index 981e0e8849..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -e - -USER_DIR="/home/core" - -if [ -e "${USER_DIR}/.ssh/authorized_keys" ]; then - exit 0 -fi - -if [ ! -d "${USER_DIR}/.ssh" ]; then - mkdir -p ${USER_DIR}/.ssh - chmod 700 ${USER_DIR}/.ssh -fi - -cp /usr/share/oem/vagrant.pub "${USER_DIR}/.ssh/authorized_keys" -chown -R core: "${USER_DIR}/.ssh" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r1.ebuild new file mode 120000 index 0000000000..4aa0c75f40 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r1.ebuild @@ -0,0 +1 @@ +oem-vagrant-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild index 657cce3a92..4932abe20b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1.ebuild @@ -17,8 +17,5 @@ S="${WORKDIR}" src_install() { insinto "/" - doins "${FILESDIR}/vagrant.pub" - - exeinto "/" - doexe ${FILESDIR}/run.sh + doins "${FILESDIR}/authorized_keys" }