platform.rb (vagrant-2.2.13) | : | platform.rb (vagrant-2.2.14) | ||
---|---|---|---|---|
skipping to change at line 557 | skipping to change at line 557 | |||
wsl? && wsl_windows_access? && | wsl? && wsl_windows_access? && | |||
path.to_s.start_with?(wsl_windows_accessible_path.to_s) | path.to_s.start_with?(wsl_windows_accessible_path.to_s) | |||
end | end | |||
# Mount pattern for extracting local mount information | # Mount pattern for extracting local mount information | |||
MOUNT_PATTERN = /^(?<device>.+?) on (?<mount>.+?) type (?<type>.+?) \((? <options>.+)\)/.freeze | MOUNT_PATTERN = /^(?<device>.+?) on (?<mount>.+?) type (?<type>.+?) \((? <options>.+)\)/.freeze | |||
# Get list of local mount paths that are DrvFs file systems | # Get list of local mount paths that are DrvFs file systems | |||
# | # | |||
# @return [Array<String>] | # @return [Array<String>] | |||
# @todo(chrisroberts): Constantize types for check | ||||
def wsl_drvfs_mounts | def wsl_drvfs_mounts | |||
if !defined?(@_wsl_drvfs_mounts) | if !defined?(@_wsl_drvfs_mounts) | |||
@_wsl_drvfs_mounts = [] | @_wsl_drvfs_mounts = [] | |||
if wsl? | if wsl? | |||
result = Util::Subprocess.execute("mount") | result = Util::Subprocess.execute("mount") | |||
result.stdout.each_line do |line| | result.stdout.each_line do |line| | |||
info = line.match(MOUNT_PATTERN) | info = line.match(MOUNT_PATTERN) | |||
if info && info[:type] == "drvfs" | if info && (info[:type] == "drvfs" || info[:type] == "9p") | |||
@_wsl_drvfs_mounts << info[:mount] | @_wsl_drvfs_mounts << info[:mount] | |||
end | end | |||
end | end | |||
end | end | |||
end | end | |||
@_wsl_drvfs_mounts | @_wsl_drvfs_mounts | |||
end | end | |||
# Check if given path is located on DrvFs file system | # Check if given path is located on DrvFs file system | |||
# | # | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |