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

Merge pull request #5222 from simonjbeaumont/fix-regex 

Allow colon in NFS ID regex
This commit is contained in:
Seth Vargo 2015-01-20 09:58:31 -05:00
parent 61e501b2c1 3deed353ae
commit 0cfe5ebfa6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hosts/bsd/cap/nfs.rb
View File

@ -137,7 +137,7 @@ module VagrantPlugins
user = Process.uid user = Process.uid
File.read("/etc/exports").lines.each do |line| File.read("/etc/exports").lines.each do |line|
if id = line[/^# VAGRANT-BEGIN:( #{user})? ([\.\/A-Za-z0-9\-_]+?)$/, 2] if id = line[/^# VAGRANT-BEGIN:( #{user})? ([\.\/A-Za-z0-9\-_:]+?)$/, 2]
if valid_ids.include?(id) if valid_ids.include?(id)
logger.debug("Valid ID: #{id}") logger.debug("Valid ID: #{id}")
else else

2
plugins/hosts/linux/cap/nfs.rb
View File

@ -71,7 +71,7 @@ module VagrantPlugins
user = Process.uid user = Process.uid
File.read("/etc/exports").lines.each do |line| File.read("/etc/exports").lines.each do |line|
if id = line[/^# VAGRANT-BEGIN:( #{user})? ([\.\/A-Za-z0-9\-_]+?)$/, 2] if id = line[/^# VAGRANT-BEGIN:( #{user})? ([\.\/A-Za-z0-9\-_:]+?)$/, 2]
if valid_ids.include?(id) if valid_ids.include?(id)
logger.debug("Valid ID: #{id}") logger.debug("Valid ID: #{id}")
else else