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

Redhat 7 to use systemd as well … 

Change nfs plugin to detect distribution and version

Fixes issue #4227
This commit is contained in:
Steven Leung 2014-07-21 10:50:52 -07:00
parent efd1d5e11b
commit 1fc36d2d3a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/hosts/redhat/cap/nfs.rb
View File

@ -22,10 +22,12 @@ module VagrantPlugins
release_file = Pathname.new("/etc/redhat-release") release_file = Pathname.new("/etc/redhat-release")
begin begin
release_file.open("r:ISO-8859-1:UTF-8") do |f| release_file.open("r:ISO-8859-1:UTF-8") do |f|
fedora_match = /Fedora.* release ([0-9]+)/.match(f.gets) match = /(Red Hat|CentOS|Fedora).* release ([0-9]+)/.match(f.gets)
if fedora_match if match
version_number = fedora_match[1].to_i distribution = match[1]
if version_number >= 16 version_number = match[2].to_i
if (distribution =~ /Fedora/ && version_number >= 16) ||
(distribution =~ /Red Hat|CentOS/ && version_number >= 7)
# "service nfs-server" will redirect properly to systemctl # "service nfs-server" will redirect properly to systemctl
# when "service nfs-server restart" is called. # when "service nfs-server restart" is called.
nfs_server_binary = "/usr/sbin/service nfs-server" nfs_server_binary = "/usr/sbin/service nfs-server"