vagrant-winnfsd 1.2.0 → 1.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +8 -0
- data/bin/winnfsd.exe +0 -0
- data/lib/vagrant-winnfsd/cap/nfs.rb +9 -11
- data/lib/vagrant-winnfsd/synced_folder.rb +4 -3
- data/lib/vagrant-winnfsd/version.rb +1 -1
- metadata +2 -2
data/CHANGELOG
CHANGED
@@ -1,6 +1,14 @@
|
|
1
1
|
CHANGELOG
|
2
2
|
=========
|
3
3
|
|
4
|
+
1.2.1
|
5
|
+
------
|
6
|
+
|
7
|
+
Updated binary to version 2.1.1 (small files, see https://github.com/winnfsd/winnfsd/releases/tag/2.1.1 for details)
|
8
|
+
Store nfspaths in current user home directory to allow executing without administrator rights (see https://github.com/winnfsd/vagrant-winnfsd/pull/85)
|
9
|
+
Fixed parameter merging from a basebox (see https://github.com/winnfsd/vagrant-winnfsd/issues/93)
|
10
|
+
Fix host_ip config (see https://github.com/winnfsd/vagrant-winnfsd/pull/80)
|
11
|
+
|
4
12
|
1.2.0
|
5
13
|
------
|
6
14
|
|
data/bin/winnfsd.exe
CHANGED
Binary file
|
@@ -9,34 +9,32 @@ module VagrantWinNFSd
|
|
9
9
|
@nfs_check_command = "\"#{executable}\" status"
|
10
10
|
@nfs_start_command = "\"#{executable}\" start"
|
11
11
|
@nfs_stop_command = "\"#{executable}\" halt"
|
12
|
-
@nfs_path_file = "#{Vagrant.
|
12
|
+
@nfs_path_file = "#{Vagrant.user_data_path}/nfspaths"
|
13
13
|
|
14
|
-
def self.nfs_export(env,
|
15
|
-
ui.info I18n.t('vagrant_winnfsd.hosts.windows.nfs_export')
|
14
|
+
def self.nfs_export(env, machine, ips, folders)
|
15
|
+
machine.ui.info I18n.t('vagrant_winnfsd.hosts.windows.nfs_export')
|
16
16
|
sleep 0.5
|
17
17
|
|
18
|
-
self.nfs_cleanup(id)
|
18
|
+
self.nfs_cleanup(machine.id)
|
19
19
|
nfs_file_lines = []
|
20
20
|
|
21
|
-
nfs_file_lines.push("# VAGRANT-BEGIN: #{Process.uid} #{id}")
|
21
|
+
nfs_file_lines.push("# VAGRANT-BEGIN: #{Process.uid} #{machine.id}")
|
22
22
|
folders.each do |k, opts|
|
23
23
|
hostpath = opts[:hostpath].dup
|
24
24
|
hostpath.gsub!("'", "'\\\\''")
|
25
25
|
hostpath.gsub('/', '\\')
|
26
26
|
nfs_file_lines.push("#{hostpath}")
|
27
27
|
end
|
28
|
-
nfs_file_lines.push("# VAGRANT-END: #{Process.uid} #{id}")
|
28
|
+
nfs_file_lines.push("# VAGRANT-END: #{Process.uid} #{machine.id}")
|
29
29
|
|
30
30
|
File.open(@nfs_path_file, 'a') do |f|
|
31
31
|
f.puts(nfs_file_lines)
|
32
32
|
end
|
33
33
|
|
34
|
-
|
35
|
-
|
36
34
|
unless self.nfs_running?
|
37
|
-
gid =
|
38
|
-
uid =
|
39
|
-
logging =
|
35
|
+
gid = machine.config.winnfsd.gid
|
36
|
+
uid = machine.config.winnfsd.uid
|
37
|
+
logging = machine.config.winnfsd.logging
|
40
38
|
system("#{@nfs_start_command} #{logging} \"#{@nfs_path_file}\" #{uid} #{gid}")
|
41
39
|
sleep 2
|
42
40
|
end
|
@@ -42,7 +42,7 @@ module VagrantWinNFSd
|
|
42
42
|
machine.ui.info I18n.t("vagrant.actions.vm.nfs.exporting")
|
43
43
|
machine.env.host.capability(
|
44
44
|
:nfs_export,
|
45
|
-
machine
|
45
|
+
machine, machine_ip, export_folders)
|
46
46
|
end
|
47
47
|
rescue Vagrant::Errors::EnvironmentLockedError
|
48
48
|
sleep 1
|
@@ -73,8 +73,9 @@ module VagrantWinNFSd
|
|
73
73
|
# Allow override of the host IP via config.
|
74
74
|
# TODO: This should be configurable somewhere deeper in Vagrant core.
|
75
75
|
host_ip = nfsopts[:nfs_host_ip]
|
76
|
-
|
77
|
-
|
76
|
+
|
77
|
+
if (!machine.config.winnfsd.host_ip.empty?)
|
78
|
+
host_ip = machine.config.winnfsd.host_ip
|
78
79
|
end
|
79
80
|
|
80
81
|
# Mount them!
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-winnfsd
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2016-
|
13
|
+
date: 2016-07-14 00:00:00.000000000 Z
|
14
14
|
dependencies: []
|
15
15
|
description: ! ' Manage and adds support for NFS on windows.
|
16
16
|
|