Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0C98CD582 for ; Thu, 20 Sep 2012 21:01:00 +0000 (UTC) Received: (qmail 65384 invoked by uid 500); 20 Sep 2012 21:01:00 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 65296 invoked by uid 500); 20 Sep 2012 21:01:00 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 65107 invoked by uid 99); 20 Sep 2012 21:01:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Sep 2012 21:01:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5311B38772; Thu, 20 Sep 2012 21:01:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: CLOUDSTACK-131: KVM fails to copy authorized_keys to system vm now that iso is not mounted Message-Id: <20120920210100.5311B38772@tyr.zones.apache.org> Date: Thu, 20 Sep 2012 21:01:00 +0000 (UTC) CLOUDSTACK-131: KVM fails to copy authorized_keys to system vm now that iso is not mounted Signed-off-by: Edison Su Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f9e94125 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f9e94125 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f9e94125 Branch: refs/heads/4.0 Commit: f9e94125affd0ad9eba2488383385f88e284e339 Parents: 8342772 Author: Marcus Sorensen Authored: Thu Sep 20 11:06:53 2012 -0700 Committer: Edison Su Committed: Thu Sep 20 14:00:20 2012 -0700 ---------------------------------------------------------------------- .../debian/config/etc/init.d/cloud-early-config | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f9e94125/patches/systemvm/debian/config/etc/init.d/cloud-early-config ---------------------------------------------------------------------- diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index ca97d29..c579d68 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -115,6 +115,7 @@ get_boot_params() { cp -f $EXTRA_MOUNT/authorized_keys /var/cache/cloud/authorized_keys privkey=/var/cache/cloud/authorized_keys umount $EXTRA_MOUNT + cp -f $privkey /root/.ssh/ && chmod go-rwx /root/.ssh/authorized_keys ;; vmware) vmtoolsd --cmd 'machine.id.get' > /var/cache/cloud/cmdline