diff --git a/vagrant-1.7.4-nfs-on-host.patch b/vagrant-1.7.4-nfs-on-host.patch new file mode 100644 index 0000000..996ca60 --- /dev/null +++ b/vagrant-1.7.4-nfs-on-host.patch @@ -0,0 +1,31 @@ +From d09e8e6f500d0c6b237ec1979d5fa64025fbc152 Mon Sep 17 00:00:00 2001 +From: Yang Sheng Han +Date: Mon, 13 Jul 2015 14:18:27 +0800 +Subject: [PATCH] guests/redhat: Fixed the NFS detection on guest, not host + [GH-5948] + +--- + plugins/guests/redhat/cap/nfs_client.rb | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugins/guests/redhat/cap/nfs_client.rb b/plugins/guests/redhat/cap/nfs_client.rb +index 14e69d5..ef88e99 100644 +--- a/plugins/guests/redhat/cap/nfs_client.rb ++++ b/plugins/guests/redhat/cap/nfs_client.rb +@@ -15,12 +15,12 @@ def self.nfs_client_installed(machine) + + protected + +- def self.systemd? +- `ps -o comm= 1`.chomp == 'systemd' ++ def self.systemd?(machine) ++ machine.communicate.test("test $(ps -o comm= 1) == 'systemd'") + end + + def self.restart_nfs(machine) +- if systemd? ++ if systemd?(machine) + machine.communicate.sudo("/bin/systemctl restart rpcbind nfs") + else + machine.communicate.sudo("/etc/init.d/rpcbind restart; /etc/init.d/nfs restart") + diff --git a/vagrant.spec b/vagrant.spec index f87e32e..8810383 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -4,7 +4,7 @@ Name: vagrant Version: 1.7.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Build and distribute virtualized development environments Group: Development/Languages License: MIT @@ -50,6 +50,10 @@ Patch5: vagrant-nfs-fix.patch # https://github.com/mitchellh/vagrant/pull/5884 Patch6: vagrant-match-interface-on-mac.patch +# Fix: check for NFS on guest +# https://github.com/mitchellh/vagrant/commit/d09e8e6f500d0c6b237ec1979d5fa64025fbc152 +Patch7: vagrant-1.7.4-nfs-on-host.patch + Requires: ruby(release) Requires: ruby(rubygems) >= 1.3.6 # Explicitly specify MRI, since Vagrant does not work with JRuby ATM. @@ -118,6 +122,7 @@ Documentation for %{name}. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build @@ -244,6 +249,10 @@ getent group vagrant >/dev/null || groupadd -r vagrant %changelog +* Wed Aug 26 2015 Josef Stribny - 1.7.2-10 +- Patch: Fix NFS detection + - related: rhbz#1245970 + * Fri Jul 10 2015 Dan Williams - 1.7.2-9 - Allow matching interfaces on MAC address