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

hosts/*: NFS prune regexp matches file paths [GH-3815]

This commit is contained in:
Mitchell Hashimoto 2014-10-24 12:16:53 -07:00
parent 64139f2158
commit ea983e32c8
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -83,6 +83,7 @@ BUG FIXES:
- provisioners/shell: Retry getting SSH info a few times. [GH-3924] - provisioners/shell: Retry getting SSH info a few times. [GH-3924]
- provisioners/shell: PowerShell scripts can have args. [GH-4548] - provisioners/shell: PowerShell scripts can have args. [GH-4548]
- synced\_folders/nfs: Don't modify NFS exports file if no exports. [GH-4619] - synced\_folders/nfs: Don't modify NFS exports file if no exports. [GH-4619]
- synced\_folders/nfs: Prune exports for file path IDs. [GH-3815]
PLUGIN AUTHOR CHANGES: PLUGIN AUTHOR CHANGES:

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