haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9935 from whitel/fix-for-#9878 

Fixes the change in packaging for nfs in f28 (#9878)
This commit is contained in:
Chris Roberts 2018-07-27 10:22:42 -07:00 committed by GitHub
parent 11745207db f0b9d025e4
commit 584b288b8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/guests/redhat/cap/nfs_client.rb
View File

@ -5,7 +5,11 @@ module VagrantPlugins
def self.nfs_client_install(machine)
machine.communicate.sudo <<-EOH.gsub(/^ {12}/, '')
if command -v dnf; then
if `dnf info -q libnfs-utils > /dev/null 2>&1` ; then
dnf -y install nfs-utils libnfs-utils portmap
else
dnf -y install nfs-utils nfs-utils-lib portmap
fi
else
yum -y install nfs-utils nfs-utils-lib portmap
fi

1
test/unit/plugins/guests/redhat/cap/nfs_client_test.rb
View File

@ -23,7 +23,6 @@ describe "VagrantPlugins::GuestRedHat::Cap:NFSClient" do
it "installs rsync" do
cap.nfs_client_install(machine)
expect(comm.received_commands[0]).to match(/install nfs-utils nfs-utils-lib portmap/)
expect(comm.received_commands[0]).to match(/\/bin\/systemctl restart rpcbind nfs/)
end
end