vagrant-parallels 1.7.7 → 2.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/CHANGELOG.md +73 -35
- data/README.md +29 -31
- data/lib/vagrant-parallels/action.rb +2 -0
- data/lib/vagrant-parallels/action/box_unregister.rb +2 -2
- data/lib/vagrant-parallels/action/import.rb +2 -12
- data/lib/vagrant-parallels/action/network.rb +6 -1
- data/lib/vagrant-parallels/action/package_vagrantfile.rb +33 -0
- data/lib/vagrant-parallels/action/prepare_clone_snapshot.rb +1 -2
- data/lib/vagrant-parallels/action/sane_defaults.rb +3 -18
- data/lib/vagrant-parallels/cap/mount_options.rb +39 -0
- data/lib/vagrant-parallels/config.rb +1 -1
- data/lib/vagrant-parallels/driver/base.rb +14 -36
- data/lib/vagrant-parallels/driver/meta.rb +6 -8
- data/lib/vagrant-parallels/driver/pd_11.rb +2 -2
- data/lib/vagrant-parallels/driver/pd_12.rb +1 -1
- data/lib/vagrant-parallels/errors.rb +9 -5
- data/lib/vagrant-parallels/guest_cap/linux/mount_parallels_shared_folder.rb +31 -64
- data/lib/vagrant-parallels/plugin.rb +15 -1
- data/lib/vagrant-parallels/synced_folder.rb +10 -20
- data/lib/vagrant-parallels/util/unix_mount_helpers.rb +121 -0
- data/lib/vagrant-parallels/version.rb +1 -1
- data/locales/en.yml +27 -14
- metadata +14 -13
- data/lib/vagrant-parallels/driver/pd_10.rb +0 -20
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
2
|
+
SHA256:
|
|
3
|
+
metadata.gz: 86f3ba721613e8310adfe4cb4adb335703bc398eb6f28e0d8525af257b3be729
|
|
4
|
+
data.tar.gz: 389a8f69e3125f0ecd3e66d3b418f16cbb8a424a17097300cde59b9f91ace6df
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d36309ae8b86da70114723881277f840d76220fcedb570b047cdc345b0cde34bc7e363614698d3c959429a86e34470c9a2463b9c613b708b1a9046dcf9e9fe6a
|
|
7
|
+
data.tar.gz: 97e8598b3ab0ea621264efcae32877f3afb914a73f0d36d9653cce093a01207de46db0a2af619fd6350fa8a078e740e74199294d1f0b05cdaae836898d68a23d
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,41 @@
|
|
|
1
|
+
## 2.2.0 (March 3, 2021)
|
|
2
|
+
IMPROVEMENTS:
|
|
3
|
+
- Mount shared folders after manual VM reboot
|
|
4
|
+
[[GH-377](https://github.com/Parallels/vagrant-parallels/pull/377)]
|
|
5
|
+
|
|
6
|
+
BUG FIXES:
|
|
7
|
+
- Fixed mount of shared folders with non-ASCII symbols in the name
|
|
8
|
+
[[GH-290](https://github.com/Parallels/vagrant-parallels/issues/290)]
|
|
9
|
+
|
|
10
|
+
## 2.1.0 (November 25, 2020)
|
|
11
|
+
BUG FIXES:
|
|
12
|
+
- Fixed the private network adapter workflow on macOS 11.0 Big Sur
|
|
13
|
+
[[GH-371](https://github.com/Parallels/vagrant-parallels/pull/371)]
|
|
14
|
+
- Fixed the concurrency issue with box unregister in multi-vm environment
|
|
15
|
+
[[GH-370](https://github.com/Parallels/vagrant-parallels/pull/370)]
|
|
16
|
+
- Fixed the `vagrant package` with custom `Vagrantfile`
|
|
17
|
+
[[GH-368](https://github.com/Parallels/vagrant-parallels/pull/368)]
|
|
18
|
+
|
|
19
|
+
## 2.0.1 (April 23, 2019)
|
|
20
|
+
BUG FIXES:
|
|
21
|
+
- Fixed the error message for host-only network collision
|
|
22
|
+
[[GH-340](https://github.com/Parallels/vagrant-parallels/issues/340)]
|
|
23
|
+
|
|
24
|
+
## 2.0.0 (November 19, 2018)
|
|
25
|
+
BREAKING CHANGES:
|
|
26
|
+
- **Linked Clone feature is enabled by default.**
|
|
27
|
+
Now each time when you create a new virtual machine with `vagrant up` it is
|
|
28
|
+
created as a linked clone of the box image (instead of the full clone, as it
|
|
29
|
+
was before). Read more about it:
|
|
30
|
+
[Full Clone vs Linked Clone](https://parallels.github.io/vagrant-parallels/docs/configuration.html#linked_clone).
|
|
31
|
+
- **Dropped support of Parallels Desktop 10**. It reached
|
|
32
|
+
[End-of-Life and End-of-Support](https://kb.parallels.com/eu/122533).
|
|
33
|
+
|
|
34
|
+
## 1.7.8 (November 18, 2017)
|
|
35
|
+
BUG FIXES:
|
|
36
|
+
- Fixed warning messages with Vagrant v2.0.1
|
|
37
|
+
[[GH-311](https://github.com/Parallels/vagrant-parallels/issues/311)]
|
|
38
|
+
|
|
1
39
|
## 1.7.7 (October 15, 2017)
|
|
2
40
|
BUG FIXES:
|
|
3
41
|
- Fixed synced folder mounting on guests with Upstart (Ubuntu 14.*)
|
|
@@ -7,40 +45,40 @@ BUG FIXES:
|
|
|
7
45
|
## 1.7.6 (July 31, 2017)
|
|
8
46
|
BUG FIXES:
|
|
9
47
|
- Fixed `vagrant up` failure if the box image was automatically renamed due
|
|
10
|
-
to the name conflict.
|
|
48
|
+
to the name conflict.
|
|
11
49
|
[[GH-303](https://github.com/Parallels/vagrant-parallels/issues/303)]
|
|
12
50
|
|
|
13
51
|
|
|
14
52
|
## 1.7.5 (May 27, 2017)
|
|
15
53
|
BUG FIXES:
|
|
16
54
|
- Fixed compatibility with Vagrant v1.9.5+. `nokogiri` gem is defined as
|
|
17
|
-
a plugin runtime dependency.
|
|
55
|
+
a plugin runtime dependency.
|
|
18
56
|
[[GH-297](https://github.com/Parallels/vagrant-parallels/issues/297)],
|
|
19
57
|
[[GH-298](https://github.com/Parallels/vagrant-parallels/pull/298)]
|
|
20
|
-
|
|
21
|
-
**NB!** To use the plugin with Vagrant v1.9.5 you should (re)install it with
|
|
58
|
+
|
|
59
|
+
**NB!** To use the plugin with Vagrant v1.9.5 you should (re)install it with
|
|
22
60
|
`NOKOGIRI_USE_SYSTEM_LIBRARIES` enabled:
|
|
23
61
|
```bash
|
|
24
62
|
$ vagrant plugin uninstall vagrant-parallels
|
|
25
63
|
$ NOKOGIRI_USE_SYSTEM_LIBRARIES=true vagrant plugin install vagrant-parallels
|
|
26
64
|
```
|
|
27
|
-
|
|
65
|
+
|
|
28
66
|
|
|
29
67
|
## 1.7.4 (April 20, 2017)
|
|
30
68
|
IMPROVEMENTS:
|
|
31
|
-
- Make start action (`"vagrant up"`) run provisioners if VM is running.
|
|
69
|
+
- Make start action (`"vagrant up"`) run provisioners if VM is running.
|
|
32
70
|
[[GH-294](https://github.com/Parallels/vagrant-parallels/pull/294)]
|
|
33
71
|
|
|
34
72
|
BUG FIXES:
|
|
35
|
-
- Properly handle `"paused"` VM state for up and halt actions.
|
|
73
|
+
- Properly handle `"paused"` VM state for up and halt actions.
|
|
36
74
|
[[GH-295](https://github.com/Parallels/vagrant-parallels/pull/295)]
|
|
37
75
|
- synced_folder: Escape special characters in Windows-specific guest paths.
|
|
38
|
-
[[GH-296](https://github.com/Parallels/vagrant-parallels/pull/296)]
|
|
39
|
-
|
|
76
|
+
[[GH-296](https://github.com/Parallels/vagrant-parallels/pull/296)]
|
|
77
|
+
|
|
40
78
|
|
|
41
79
|
## 1.7.3 (February 28, 2017)
|
|
42
80
|
BUG FIXES:
|
|
43
|
-
- Fix exceptions related to `nokogiri` gem.
|
|
81
|
+
- Fix exceptions related to `nokogiri` gem.
|
|
44
82
|
[[GH-291](https://github.com/Parallels/vagrant-parallels/issues/291)],
|
|
45
83
|
[[GH-292](https://github.com/Parallels/vagrant-parallels/issues/292)]
|
|
46
84
|
|
|
@@ -53,28 +91,28 @@ BUG FIXES:
|
|
|
53
91
|
|
|
54
92
|
## 1.7.1 (December 7, 2016)
|
|
55
93
|
FEATURES:
|
|
56
|
-
- **Guest capability for installing Parallels Tools in Windows.** Now it is
|
|
94
|
+
- **Guest capability for installing Parallels Tools in Windows.** Now it is
|
|
57
95
|
possible to install/upgrade Parallels Tools in Windows guests using
|
|
58
96
|
the provider option `update_guest_tools`. [[GH-284](https://github.com/Parallels/vagrant-parallels/pull/284)]
|
|
59
|
-
|
|
97
|
+
|
|
60
98
|
BUG FIXES:
|
|
61
99
|
- Fix issues of auto-updating Parallels Tools in Linux guests with Parallels Desktop 12+.
|
|
62
100
|
[[GH-283](https://github.com/Parallels/vagrant-parallels/pull/283)],
|
|
63
101
|
[[GH-282](https://github.com/Parallels/vagrant-parallels/pull/282)],
|
|
64
102
|
[[GH-281](https://github.com/Parallels/vagrant-parallels/pull/281)]
|
|
65
|
-
|
|
103
|
+
|
|
66
104
|
|
|
67
105
|
## 1.7.0 (November 15, 2016)
|
|
68
106
|
BREAKING CHANGES:
|
|
69
|
-
- **Dropped support of Parallels Desktop 8 and 9**. These versions have
|
|
70
|
-
reached their [End-of-Life and End-of-Support](
|
|
107
|
+
- **Dropped support of Parallels Desktop 8 and 9**. These versions have
|
|
108
|
+
reached their [End-of-Life and End-of-Support](https://kb.parallels.com/eu/122533).
|
|
71
109
|
- **Removed customization options, which were previously deprecated:** [[GH-271](https://github.com/Parallels/vagrant-parallels/pull/271)]
|
|
72
110
|
- "use_linked_clone" - use `linked_clone` instead.
|
|
73
111
|
- "regen_box_uuid" - use `regen_src_uuid` instead.
|
|
74
|
-
- "optimize_power_consumption".
|
|
75
|
-
|
|
112
|
+
- "optimize_power_consumption".
|
|
113
|
+
|
|
76
114
|
FEATURES:
|
|
77
|
-
- **IPv6 Private Networks:** Private networking now supports IPv6.
|
|
115
|
+
- **IPv6 Private Networks:** Private networking now supports IPv6.
|
|
78
116
|
This only works with Parallels Desktop 12 and higher.
|
|
79
117
|
[[GH-273](https://github.com/Parallels/vagrant-parallels/pull/273)]
|
|
80
118
|
|
|
@@ -89,23 +127,23 @@ DEPRECATIONS:
|
|
|
89
127
|
[[GH-260](https://github.com/Parallels/vagrant-parallels/pull/260)]
|
|
90
128
|
|
|
91
129
|
IMPROVEMENTS:
|
|
92
|
-
- Allow to package linked clones with `vagrant package`. External disk images
|
|
93
|
-
will be automatically copied, so the resulted box become a full-sized
|
|
130
|
+
- Allow to package linked clones with `vagrant package`. External disk images
|
|
131
|
+
will be automatically copied, so the resulted box become a full-sized
|
|
94
132
|
standalone VM. [[GH-262](https://github.com/Parallels/vagrant-parallels/pull/262)]
|
|
95
133
|
- Handle the situation when host machine is not connected to Shared network.
|
|
96
134
|
With Parallels Desktop 11.2.1+ Vagrant will connect it automatically. With earlier
|
|
97
|
-
versions, the human-readable error message will be displayed.
|
|
135
|
+
versions, the human-readable error message will be displayed.
|
|
98
136
|
[[GH-266](https://github.com/Parallels/vagrant-parallels/pull/266)]
|
|
99
|
-
- Disable home folder sharing by default (Parallels Desktop 11+).
|
|
137
|
+
- Disable home folder sharing by default (Parallels Desktop 11+).
|
|
100
138
|
[[GH-257](https://github.com/Parallels/vagrant-parallels/pull/257)]
|
|
101
139
|
|
|
102
140
|
BUG FIXES:
|
|
103
141
|
- action/box_unregister: Fix `#recover` method for layered environments.
|
|
104
142
|
[[GH-261](https://github.com/Parallels/vagrant-parallels/pull/261)]
|
|
105
|
-
- action/network: Fix an exception when option "Connect Mac to
|
|
143
|
+
- action/network: Fix an exception when option "Connect Mac to
|
|
106
144
|
this network" is disabled. [[GH-268](https://github.com/Parallels/vagrant-parallels/pull/268)]
|
|
107
|
-
- commands/snapshot: Add retries for snapshot commands to avoid `prlctl`
|
|
108
|
-
failures. [[GH-259](https://github.com/Parallels/vagrant-parallels/pull/259)]
|
|
145
|
+
- commands/snapshot: Add retries for snapshot commands to avoid `prlctl`
|
|
146
|
+
failures. [[GH-259](https://github.com/Parallels/vagrant-parallels/pull/259)]
|
|
109
147
|
|
|
110
148
|
|
|
111
149
|
## 1.6.2 (March 23, 2016)
|
|
@@ -114,28 +152,28 @@ BUG FIXES:
|
|
|
114
152
|
|
|
115
153
|
IMPROVEMENTS:
|
|
116
154
|
- action/destroy: Destroy suspended VMs without resuming
|
|
117
|
-
|
|
155
|
+
|
|
118
156
|
## 1.6.1 (January 13, 2016)
|
|
119
157
|
|
|
120
158
|
BUG FIXES:
|
|
121
|
-
- action/import: Fix `regenerate_src_uuid` option behavior in parallel run
|
|
159
|
+
- action/import: Fix `regenerate_src_uuid` option behavior in parallel run
|
|
122
160
|
[[GH-241](https://github.com/Parallels/vagrant-parallels/pull/241)]
|
|
123
|
-
- action/box_unregister: Use temporary lock file to prevent early unregister
|
|
161
|
+
- action/box_unregister: Use temporary lock file to prevent early unregister
|
|
124
162
|
in parallel run [[GH-244](https://github.com/Parallels/vagrant-parallels/pull/244)]
|
|
125
163
|
- action/network: Fix detection of the next virtual network ID [[GH-245](https://github.com/Parallels/vagrant-parallels/pull/245)]
|
|
126
164
|
|
|
127
165
|
|
|
128
166
|
## 1.6.0 (December 24, 2015)
|
|
129
167
|
BREAKING CHANGES:
|
|
130
|
-
|
|
131
|
-
- The required Vagrant version is **1.8** or higher. It is caused by changes
|
|
168
|
+
|
|
169
|
+
- The required Vagrant version is **1.8** or higher. It is caused by changes
|
|
132
170
|
in Vagrant plugin model.
|
|
133
|
-
|
|
171
|
+
|
|
134
172
|
SUPPORT FOR VAGRANT FEATURES:
|
|
135
173
|
|
|
136
|
-
- `vagrant port`: This command displays the list of forwarded ports from the
|
|
174
|
+
- `vagrant port`: This command displays the list of forwarded ports from the
|
|
137
175
|
guest to the host
|
|
138
|
-
- `vagrant snapshot`: This command can be used to checkpoint and restore
|
|
176
|
+
- `vagrant snapshot`: This command can be used to checkpoint and restore
|
|
139
177
|
point-in-time snapshots [[GH-228](https://github.com/Parallels/vagrant-parallels/pull/228)]
|
|
140
178
|
|
|
141
179
|
IMPROVEMENTS:
|
|
@@ -150,10 +188,10 @@ IMPROVEMENTS:
|
|
|
150
188
|
|
|
151
189
|
BUG FIXES:
|
|
152
190
|
|
|
153
|
-
- action/forward_ports: Add parallel-safe lock to avoid collisions of
|
|
191
|
+
- action/forward_ports: Add parallel-safe lock to avoid collisions of
|
|
154
192
|
forwarded ports in multi-machine env [[GH-226](https://github.com/Parallels/vagrant-parallels/pull/226)]
|
|
155
193
|
|
|
156
194
|
## Previous Versions
|
|
157
195
|
|
|
158
196
|
Please, refer to [Releases](https://github.com/Parallels/vagrant-parallels/releases)
|
|
159
|
-
page on GitHub.
|
|
197
|
+
page on GitHub.
|
data/README.md
CHANGED
|
@@ -1,37 +1,37 @@
|
|
|
1
1
|
# Vagrant Parallels Provider
|
|
2
|
-
[]
|
|
2
|
+
[](https://badge.fury.io/rb/vagrant-parallels)
|
|
3
|
+
[](https://travis-ci.org/Parallels/vagrant-parallels)
|
|
4
|
+
[](https://codeclimate.com/github/Parallels/vagrant-parallels)
|
|
5
|
+
|
|
6
|
+
_Vagrant Parallels Provider_ is a plugin for [Vagrant](https://www.vagrantup.com),
|
|
7
|
+
allowing to manage [Parallels Desktop](https://www.parallels.com/products/desktop/)
|
|
8
|
+
virtual machines on macOS hosts.
|
|
9
|
+
|
|
10
|
+
### Requirements
|
|
11
|
+
- [Vagrant v1.8](https://www.vagrantup.com) or higher
|
|
12
|
+
(_there are known issues with Vagrant v1.9.5
|
|
13
|
+
[[GH-297](https://github.com/Parallels/vagrant-parallels/issues/297#issuecomment-304458691)]
|
|
14
14
|
and v1.9.6 [[GH-301]](https://github.com/Parallels/vagrant-parallels/issues/301)_)
|
|
15
|
-
- [Parallels Desktop
|
|
15
|
+
- [Parallels Desktop 11 for Mac](https://www.parallels.com/products/desktop/) or higher
|
|
16
16
|
|
|
17
|
-
*Note:* Only **Pro** and **Business** editions of **Parallels Desktop for Mac**
|
|
18
|
-
are compatible with this Vagrant provider.
|
|
19
|
-
Standard edition doesn't have a command line functionality and can not be used
|
|
17
|
+
*Note:* Only **Pro** and **Business** editions of **Parallels Desktop for Mac**
|
|
18
|
+
are compatible with this Vagrant provider.
|
|
19
|
+
Standard edition doesn't have a full command line functionality and can not be used
|
|
20
20
|
with Vagrant.
|
|
21
21
|
|
|
22
22
|
## Features
|
|
23
|
-
The Parallels provider supports all basic Vagrant features, including
|
|
24
|
-
|
|
23
|
+
The Parallels provider supports all basic Vagrant features, including Shared Folders,
|
|
24
|
+
Private and Public Networking, Forwarded ports and Vagrant Share.
|
|
25
25
|
|
|
26
26
|
If you're just getting started with Vagrant, it is highly recommended that you
|
|
27
|
-
read the official [Vagrant documentation](
|
|
27
|
+
read the official [Vagrant documentation](https://docs.vagrantup.com/v2/) first.
|
|
28
28
|
|
|
29
29
|
## Installation
|
|
30
|
-
|
|
31
|
-
and [Vagrant](
|
|
30
|
+
Make sure that you have [Parallels Desktop for Mac](https://www.parallels.com/products/desktop/)
|
|
31
|
+
and [Vagrant](https://www.vagrantup.com/downloads.html) properly installed.
|
|
32
32
|
We recommend that you use the latest versions of these products.
|
|
33
33
|
|
|
34
|
-
|
|
34
|
+
Parallels provider is a plugin for Vagrant. Run this command to install it:
|
|
35
35
|
|
|
36
36
|
```
|
|
37
37
|
$ vagrant plugin install vagrant-parallels
|
|
@@ -40,24 +40,22 @@ $ vagrant plugin install vagrant-parallels
|
|
|
40
40
|
## Provider Documentation
|
|
41
41
|
|
|
42
42
|
More information about the Parallels provider is available in
|
|
43
|
-
[Vagrant Parallels Documentation](
|
|
43
|
+
[Vagrant Parallels Documentation](https://parallels.github.io/vagrant-parallels/docs/)
|
|
44
44
|
|
|
45
45
|
We recommend you to start from these pages:
|
|
46
|
-
* [Usage](
|
|
47
|
-
* [Getting Started](
|
|
48
|
-
* [Boxes](
|
|
46
|
+
* [Usage](https://parallels.github.io/vagrant-parallels/docs/usage.html)
|
|
47
|
+
* [Getting Started](https://parallels.github.io/vagrant-parallels/docs/getting-started.html)
|
|
48
|
+
* [Boxes](https://parallels.github.io/vagrant-parallels/docs/boxes/index.html)
|
|
49
49
|
|
|
50
50
|
## Getting Help
|
|
51
|
-
Having problems while using the provider? Ask your question on the official forum:
|
|
52
|
-
["Parallels Provider for Vagrant" forum branch](http://forum.parallels.com/forumdisplay.php?737-Parallels-Provider-for-Vagrant)
|
|
53
51
|
|
|
54
|
-
If you
|
|
52
|
+
If you have an issue with the Parallels provider or discover a bug,
|
|
55
53
|
please report it on the [Issue Tracker](https://github.com/Parallels/vagrant-parallels/issues).
|
|
56
54
|
|
|
57
55
|
## License and Authors
|
|
58
56
|
|
|
59
57
|
* Author: Youssef Shahin <yshahin@gmail.com>
|
|
60
58
|
* Author: Mikhail Zholobov <legal90@gmail.com>
|
|
61
|
-
* Copyright 2013-
|
|
59
|
+
* Copyright 2013-2020, Parallels International GmbH.
|
|
62
60
|
|
|
63
|
-
Vagrant Parallels Provider is open-sourced software licensed under the [MIT license](
|
|
61
|
+
Vagrant Parallels Provider is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
|
|
@@ -113,6 +113,7 @@ module VagrantPlugins
|
|
|
113
113
|
b1.use Package
|
|
114
114
|
b1.use Export
|
|
115
115
|
b1.use PackageConfigFiles
|
|
116
|
+
b1.use PackageVagrantfile
|
|
116
117
|
end
|
|
117
118
|
end
|
|
118
119
|
end
|
|
@@ -413,6 +414,7 @@ module VagrantPlugins
|
|
|
413
414
|
autoload :Network, File.expand_path('../action/network', __FILE__)
|
|
414
415
|
autoload :Package, File.expand_path('../action/package', __FILE__)
|
|
415
416
|
autoload :PackageConfigFiles, File.expand_path('../action/package_config_files', __FILE__)
|
|
417
|
+
autoload :PackageVagrantfile, File.expand_path('../action/package_vagrantfile', __FILE__)
|
|
416
418
|
autoload :PrepareCloneSnapshot, File.expand_path('../action/prepare_clone_snapshot', __FILE__)
|
|
417
419
|
autoload :PrepareForwardedPortCollisionParams, File.expand_path('../action/prepare_forwarded_port_collision_params', __FILE__)
|
|
418
420
|
autoload :PrepareNFSSettings, File.expand_path('../action/prepare_nfs_settings', __FILE__)
|
|
@@ -53,9 +53,9 @@ module VagrantPlugins
|
|
|
53
53
|
file.flush
|
|
54
54
|
end
|
|
55
55
|
|
|
56
|
-
# Delete the lease file if we
|
|
56
|
+
# Delete the lease file if we were the last who needed this box.
|
|
57
57
|
# Then the box image will be unregistered.
|
|
58
|
-
lease_file.delete if lease_file.read.chomp.to_i <=
|
|
58
|
+
lease_file.delete if lease_file.read.chomp.to_i <= 0
|
|
59
59
|
end
|
|
60
60
|
|
|
61
61
|
def unregister_box(env)
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
require 'nokogiri'
|
|
2
|
-
|
|
3
1
|
require 'digest/md5'
|
|
4
2
|
|
|
5
3
|
module VagrantPlugins
|
|
@@ -21,14 +19,12 @@ module VagrantPlugins
|
|
|
21
19
|
@logger.info("Disabling password restrictions: #{acts.join(', ')}")
|
|
22
20
|
env[:machine].provider.driver.disable_password_restrictions(acts)
|
|
23
21
|
|
|
24
|
-
if env[:machine].provider_config.regen_src_uuid
|
|
25
|
-
&& env[:machine].provider.pd_version_satisfies?('>= 10.1.2')
|
|
22
|
+
if env[:machine].provider_config.regen_src_uuid
|
|
26
23
|
options[:regenerate_src_uuid] = true
|
|
27
24
|
end
|
|
28
25
|
|
|
29
26
|
# Linked clones are supported only for PD 11 and higher
|
|
30
|
-
if env[:machine].provider_config.linked_clone
|
|
31
|
-
&& env[:machine].provider.pd_version_satisfies?('>= 11')
|
|
27
|
+
if env[:machine].provider_config.linked_clone
|
|
32
28
|
# Linked clone creation should not be concurrent [GH-206]
|
|
33
29
|
options[:snapshot_id] = env[:clone_snapshot_id]
|
|
34
30
|
options[:linked] = true
|
|
@@ -51,12 +47,6 @@ module VagrantPlugins
|
|
|
51
47
|
# Flag as erroneous and return if import failed
|
|
52
48
|
raise Errors::VMCloneFailure if !env[:machine].id
|
|
53
49
|
|
|
54
|
-
if env[:machine].provider_config.regen_src_uuid \
|
|
55
|
-
&& env[:machine].provider.pd_version_satisfies?('< 10.1.2')
|
|
56
|
-
@logger.info('Regenerate SourceVmUuid by editing config.pvs file')
|
|
57
|
-
env[:machine].provider.driver.regenerate_src_uuid
|
|
58
|
-
end
|
|
59
|
-
|
|
60
50
|
# Remove 'Icon\r' file from VM home (bug in PD 11.0.0)
|
|
61
51
|
if env[:machine].provider.pd_version_satisfies?('= 11.0.0')
|
|
62
52
|
vm_home = env[:machine].provider.driver.read_settings.fetch('Home')
|
|
@@ -291,7 +291,12 @@ module VagrantPlugins
|
|
|
291
291
|
@env[:machine].provider.driver.read_bridged_interfaces.each do |interface|
|
|
292
292
|
next if interface[:status] == 'Down'
|
|
293
293
|
that_netaddr = IPAddr.new("#{interface[:ip]}/#{interface[:netmask]}")
|
|
294
|
-
|
|
294
|
+
if netaddr.include? that_netaddr
|
|
295
|
+
raise VagrantPlugins::Parallels::Errors::NetworkCollision,
|
|
296
|
+
hostonly_netaddr: netaddr,
|
|
297
|
+
bridge_netaddr: that_netaddr,
|
|
298
|
+
bridge_interface: interface[:name]
|
|
299
|
+
end
|
|
295
300
|
end
|
|
296
301
|
end
|
|
297
302
|
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
require 'vagrant/util/template_renderer'
|
|
2
|
+
|
|
3
|
+
module VagrantPlugins
|
|
4
|
+
module Parallels
|
|
5
|
+
module Action
|
|
6
|
+
class PackageVagrantfile
|
|
7
|
+
# For TemplateRenderer
|
|
8
|
+
include Vagrant::Util
|
|
9
|
+
|
|
10
|
+
def initialize(app, env)
|
|
11
|
+
@app = app
|
|
12
|
+
end
|
|
13
|
+
|
|
14
|
+
def call(env)
|
|
15
|
+
@env = env
|
|
16
|
+
create_vagrantfile
|
|
17
|
+
@app.call(env)
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
# This method creates the auto-generated Vagrantfile at the root of the
|
|
21
|
+
# box. This Vagrantfile contains the MAC address so that the user doesn't
|
|
22
|
+
# have to worry about it.
|
|
23
|
+
def create_vagrantfile
|
|
24
|
+
File.open(File.join(@env["export.temp_dir"], "Vagrantfile"), "w") do |f|
|
|
25
|
+
f.write(TemplateRenderer.render("package_Vagrantfile", {
|
|
26
|
+
base_mac: @env[:machine].provider.driver.read_mac_address
|
|
27
|
+
}))
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
end
|
|
31
|
+
end
|
|
32
|
+
end
|
|
33
|
+
end
|
|
@@ -20,8 +20,7 @@ module VagrantPlugins
|
|
|
20
20
|
end
|
|
21
21
|
|
|
22
22
|
# If we're not doing a linked clone, snapshots don't matter
|
|
23
|
-
if !env[:machine].provider_config.linked_clone
|
|
24
|
-
|| env[:machine].provider.pd_version_satisfies?('< 11')
|
|
23
|
+
if !env[:machine].provider_config.linked_clone
|
|
25
24
|
return @app.call(env)
|
|
26
25
|
end
|
|
27
26
|
|
|
@@ -14,9 +14,6 @@ module VagrantPlugins
|
|
|
14
14
|
# helpers.
|
|
15
15
|
@env = env
|
|
16
16
|
|
|
17
|
-
settings = default_settings
|
|
18
|
-
|
|
19
|
-
@app.call(env) if settings.empty?
|
|
20
17
|
@env[:ui].info I18n.t('vagrant_parallels.actions.vm.sane_defaults.setting')
|
|
21
18
|
|
|
22
19
|
default_settings.each do |setting, value|
|
|
@@ -30,35 +27,23 @@ module VagrantPlugins
|
|
|
30
27
|
private
|
|
31
28
|
|
|
32
29
|
def default_settings
|
|
33
|
-
|
|
30
|
+
{
|
|
34
31
|
tools_autoupdate: 'no',
|
|
35
|
-
startup_view: 'same',
|
|
36
32
|
on_shutdown: 'close',
|
|
37
33
|
on_window_close: 'keep-running',
|
|
38
34
|
auto_share_camera: 'off',
|
|
39
35
|
smart_guard: 'off',
|
|
40
|
-
longer_battery_life: 'on'
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
return settings if @env[:machine].provider.pd_version_satisfies?('< 10.1.2')
|
|
44
|
-
settings.merge!(
|
|
36
|
+
longer_battery_life: 'on',
|
|
45
37
|
shared_cloud: 'off',
|
|
46
38
|
shared_profile: 'off',
|
|
47
39
|
smart_mount: 'off',
|
|
48
40
|
sh_app_guest_to_host: 'off',
|
|
49
41
|
sh_app_host_to_guest: 'off',
|
|
50
|
-
time_sync: 'off'
|
|
51
|
-
)
|
|
52
|
-
|
|
53
|
-
return settings if @env[:machine].provider.pd_version_satisfies?('< 11')
|
|
54
|
-
settings.merge!(
|
|
55
42
|
startup_view: 'headless',
|
|
56
43
|
time_sync: 'on',
|
|
57
44
|
disable_timezone_sync: 'on',
|
|
58
45
|
shf_host_defined: 'off'
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
settings
|
|
46
|
+
}
|
|
62
47
|
end
|
|
63
48
|
end
|
|
64
49
|
end
|