diff --git a/vagrant-1.7-remove-docker0-from-enum.patch b/vagrant-1.7-remove-docker0-from-enum.patch new file mode 100644 index 0000000..f6c008c --- /dev/null +++ b/vagrant-1.7-remove-docker0-from-enum.patch @@ -0,0 +1,23 @@ +From 8e0746843d4b518e3e6ae90e5f56f4b0a2469120 Mon Sep 17 00:00:00 2001 +From: Jim Minter +Date: Tue, 12 May 2015 21:18:31 +0100 +Subject: [PATCH] Remove docker0 from guest network interface enumeration + +--- + 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..fa83086 100644 +--- a/plugins/guests/fedora/cap/configure_networks.rb ++++ b/plugins/guests/fedora/cap/configure_networks.rb +@@ -21,7 +21,7 @@ def self.configure_networks(machine, networks) + end + + if virtual +- machine.communicate.sudo("ls /sys/class/net | grep -v lo") do |_, result| ++ machine.communicate.sudo("ls /sys/class/net | egrep -v lo\\|docker") do |_, result| + interface_names = result.split("\n") + end + + diff --git a/vagrant.spec b/vagrant.spec index 9e59651..03dd337 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -4,7 +4,7 @@ Name: vagrant Version: 1.7.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Build and distribute virtualized development environments Group: Development/Languages License: MIT @@ -38,6 +38,10 @@ Patch2: vagrant-new-fedora-releases.patch # https://github.com/mitchellh/vagrant/pull/5707 Patch3: vagrant-biosdevname.patch +# Remove docker0 from guest network interface enumeration +# https://github.com/mitchellh/vagrant/pull/5706 +Patch4: vagrant-1.7-remove-docker0-from-enum.patch + Requires: ruby(release) Requires: ruby(rubygems) >= 1.3.6 # Explicitly specify MRI, since Vagrant does not work with JRuby ATM. @@ -103,6 +107,7 @@ Documentation for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build @@ -229,6 +234,9 @@ getent group vagrant >/dev/null || groupadd -r vagrant %changelog +* Tue Jun 16 2015 Josef Stribny - 1.7.2-7 +- Fix: Remove docker0 from guest network interface enumeration + * Thu May 21 2015 Josef Stribny - 1.7.2-6 - Fix: Support new Fedora releases - Fix: Don't try to use biosdevname if it's not installed