jstribny pushed to vagrant (f21). "Fix FedoraGuest for Fedora 22"

[notifications at fedoraproject.org]

From 0880b80453a28d77cdff4ce39ee39de701835af4 Mon Sep 17 00:00:00 2001
From: Josef Stribny <jstribny at redhat.com>
Date: Thu, 21 May 2015 10:07:52 +0200
Subject: Fix FedoraGuest for Fedora 22


diff --git a/vagrant-biosdevname.patch b/vagrant-biosdevname.patch
new file mode 100644
index 0000000..03d72e5
--- /dev/null
+++ b/vagrant-biosdevname.patch
@@ -0,0 +1,26 @@
+From ccc4162ee8ca16ce560b1efdc90cafa67cbc1415 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw at redhat.com>
+Date: Tue, 12 May 2015 15:43:18 -0500
+Subject: [PATCH] fedora: don't try to use biosdevname if it's not installed
+
+If biosdevname isn't installed it doesn't make sense to try using it
+for persistent device names.  Just treat lack of biosdevname as
+virtual networking.
+---
+ plugins/guests/fedora/cap/configure_networks.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/guests/fedora/cap/configure_networks.rb b/plugins/guests/fedora/cap/configure_networks.rb
+index 2f67099..8e071b5 100644
+--- a/plugins/guests/fedora/cap/configure_networks.rb
++++ b/plugins/guests/fedora/cap/configure_networks.rb
+@@ -17,7 +17,7 @@ def self.configure_networks(machine, networks)
+           virtual = false
+           interface_names = Array.new
+           machine.communicate.sudo("/usr/sbin/biosdevname; echo $?") do |_, result|
+-            virtual = true if result.chomp == '4'
++            virtual = true if ['4', '127'].include? result.chomp
+           end
+ 
+           if virtual
+
diff --git a/vagrant-new-fedora-releases.patch b/vagrant-new-fedora-releases.patch
new file mode 100644
index 0000000..35d99d9
--- /dev/null
+++ b/vagrant-new-fedora-releases.patch
@@ -0,0 +1,22 @@
+From b85248cb973fb12caac37ebf1af287c6dfdde6de Mon Sep 17 00:00:00 2001
+From: Josef Stribny <jstribny at redhat.com>
+Date: Tue, 19 May 2015 10:44:25 +0200
+Subject: [PATCH] Recognize new Fedora releases
+
+---
+ plugins/guests/fedora/guest.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/guests/fedora/guest.rb b/plugins/guests/fedora/guest.rb
+index 64a5e3d..c1b48d4 100644
+--- a/plugins/guests/fedora/guest.rb
++++ b/plugins/guests/fedora/guest.rb
+@@ -4,7 +4,7 @@ module VagrantPlugins
+   module GuestFedora
+     class Guest < Vagrant.plugin("2", :guest)
+       def detect?(machine)
+-        machine.communicate.test("grep 'Fedora release [12][67890]' /etc/redhat-release")
++        machine.communicate.test("grep 'Fedora release 1[6789]\\|Fedora release 2[0-9]' /etc/redhat-release")
+       end
+     end
+   end
diff --git a/vagrant.spec b/vagrant.spec
index a1474ef..219f85f 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -4,7 +4,7 @@
 
 Name: vagrant
 Version: 1.7.2
-Release: 5%{?dist}.1
+Release: 6%{?dist}.1
 Summary: Build and distribute virtualized development environments
 Group: Development/Languages
 License: MIT
@@ -30,6 +30,14 @@ Patch0: vagrant-1.7.2-fix-dependencies.patch
 # https://github.com/mitchellh/vagrant/issues/5123
 Patch1: vagrant-1.7.2-provisioners-puppet-fix-exception-with-module-paths.patch
 
+# Support new Fedora releases
+# https://github.com/mitchellh/vagrant/pull/5730
+Patch2: vagrant-new-fedora-releases.patch
+
+# Don't try to use biosdevname if it's not installed
+# https://github.com/mitchellh/vagrant/pull/5707
+Patch3: vagrant-biosdevname.patch
+
 Requires: ruby(release)
 Requires: ruby(rubygems) >= 1.3.6
 # Explicitly specify MRI, since Vagrant does not work with JRuby ATM.
@@ -93,6 +101,8 @@ Documentation for %{name}.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -222,6 +232,10 @@ getent group vagrant >/dev/null || groupadd -r vagrant
 
 
 %changelog
+* Thu May 21 2015 Josef Stribny <jstribny at redhat.com> - 1.7.2-6.fc21.1
+- Fix: Support new Fedora releases
+- Fix: Don't try to use biosdevname if it's not installed
+
 * Wed May 06 2015 Josef Stribny <jstribny at redhat.com> - 1.7.2-5.fc21.1
 - Export GEM_HOME based on VAGRANT_HOME
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/vagrant.git/commit/?h=f21&id=0880b80453a28d77cdff4ce39ee39de701835af4