From 7a4e16e082834c20b8a9a802b86c2040ca869229 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Wed, 8 Apr 2015 12:05:28 -0400 Subject: [PATCH] virtualbox: add ability to import b2d instances Signed-off-by: Evan Hazlett --- drivers/virtualbox/virtualbox.go | 3 +-- utils/utils.go | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go index 83402c25ae..21727a3cd1 100644 --- a/drivers/virtualbox/virtualbox.go +++ b/drivers/virtualbox/virtualbox.go @@ -192,7 +192,7 @@ func (d *Driver) Create() error { } log.Debugf("Importing SSH key...") - keyPath := filepath.Join(utils.GetHomeDir(), ".ssh", "id_rsa") + keyPath := filepath.Join(utils.GetHomeDir(), ".ssh", "id_boot2docker") if err := utils.CopyFile(keyPath, d.GetSSHKeyPath()); err != nil { return err } @@ -203,7 +203,6 @@ func (d *Driver) Create() error { } log.Infof("Creating SSH key...") - if err := ssh.GenerateSSHKey(d.GetSSHKeyPath()); err != nil { return err } diff --git a/utils/utils.go b/utils/utils.go index 97a56e7743..c4899ef906 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -79,6 +79,15 @@ func CopyFile(src, dst string) error { return err } + fi, err := os.Stat(src) + if err != nil { + return err + } + + if err := os.Chmod(dst, fi.Mode()); err != nil { + return err + } + return nil }