From 17b8e08044e9c6dc099a992723ac24ee56cd98a7 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 11 Jun 2015 12:47:35 -0700 Subject: [PATCH 1/3] coreos-base/oem-vagrant: use insecure key --- .../coreos-base/oem-vagrant/files/box/Vagrantfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile index 4b0aa753f2..38de94e163 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile @@ -10,6 +10,9 @@ require_relative 'configure_networks.rb' require_relative 'base_mac.rb' Vagrant.configure("2") do |config| + # always use Vagrants insecure key + config.ssh.insert_key = false + # SSH in as the default 'core' user, it has the vagrant ssh key. config.ssh.username = "core" From ed61fa75bb183f05d2688a2386ef0dba5108b04c Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 11 Jun 2015 12:48:01 -0700 Subject: [PATCH 2/3] coreos-base/oem-vagrant: strip leading '-' from path --- .../coreos-base/oem-vagrant/files/box/change_host_name.rb | 2 +- .../coreos-base/oem-vagrant/files/box/configure_networks.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/change_host_name.rb b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/change_host_name.rb index dfab7916be..bae625e235 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/change_host_name.rb +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/change_host_name.rb @@ -26,7 +26,7 @@ module VagrantPlugins temp.close path = "/var/tmp/hostname.yml" - path_esc = path.gsub("/", "-") + path_esc = path.gsub("/", "-")[1..-1] comm.upload(temp.path, path) comm.sudo("systemctl start system-cloudinit@#{path_esc}.service") end diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb index 3990500dad..83377103a4 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb @@ -87,7 +87,7 @@ module VagrantPlugins temp.close path = "/var/tmp/networks.yml" - path_esc = path.gsub("/", "-") + path_esc = path.gsub("/", "-")[1..-1] comm.upload(temp.path, path) comm.sudo("systemctl start system-cloudinit@#{path_esc}.service") end From 14dc5163ee54fe71cd45908af7f1274cb05b873c Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 11 Jun 2015 12:58:54 -0700 Subject: [PATCH 3/3] coreos-base/oem-vagrant: bump ebuild --- ...{oem-vagrant-0.0.1-r12.ebuild => oem-vagrant-0.0.1-r13.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/{oem-vagrant-0.0.1-r12.ebuild => oem-vagrant-0.0.1-r13.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r12.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r13.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r12.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r13.ebuild