commit af8dd7b7e72f2514480a0b14ad3121c2808d67ef
Author: Elan Ruusamäe <[email protected]>
Date: Sun Feb 1 21:22:35 2015 +0200
disable insert_key by default
insert-key.patch | 15 +++++++++++++++
vagrant.spec | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/vagrant.spec b/vagrant.spec
index 055fbbb..dc19d9e 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -4,7 +4,7 @@ Summary: Provisioning and deployment of virtual instances
Name: vagrant
Version: 1.7.1
# NOTE: test that it actually works before doing rel "1"
-Release: 0.9
+Release: 0.10
License: MIT
Group: Applications/Emulators
Source0:
https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@ Patch3: Vagrantfile.patch
Patch4: version.patch
Patch5: no-gems.patch
Patch6: checkpoint.patch
+Patch7: insert-key.patch
URL: http://www.vagrantup.com/
BuildRequires: bash
BuildRequires: rpm-rubyprov
@@ -122,6 +123,7 @@ Ruby documentation for %{gem_name}
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
VERSION=$(cat version.txt)
sed -i -e "s/__VERSION__/$VERSION/" lib/vagrant/version.rb
diff --git a/insert-key.patch b/insert-key.patch
new file mode 100644
index 0000000..0a6c2a6
--- /dev/null
+++ b/insert-key.patch
@@ -0,0 +1,15 @@
+disable insert_key=trye by default
+
+https://github.com/mitchellh/vagrant/issues/2608
+
+--- vagrant-1.7.1/plugins/kernel_v2/config/ssh_connect.rb~ 2014-12-12
11:36:39.000000000 +0200
++++ vagrant-1.7.1/plugins/kernel_v2/config/ssh_connect.rb 2015-02-01
20:47:27.907465716 +0200
+@@ -23,7 +23,7 @@
+ @private_key_path = nil if @private_key_path == UNSET_VALUE
+ @username = nil if @username == UNSET_VALUE
+ @password = nil if @password == UNSET_VALUE
+- @insert_key = true if @insert_key == UNSET_VALUE
++ @insert_key = false if @insert_key == UNSET_VALUE
+
+ if @private_key_path && !@private_key_path.is_a?(Array)
+ @private_key_path = [@private_key_path]
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vagrant.git/commitdiff/af8dd7b7e72f2514480a0b14ad3121c2808d67ef
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
