vagrant-parallels 2.0.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a40565034c3032c1536e75c37bd10287c87200e0
-  data.tar.gz: fcf16876294f17f6843c1acbe698ba111cbfee5f
+SHA256:
+  metadata.gz: d138c790174855049184943ea5dada1b980eee3755f88f5e20059a2851fb2aa9
+  data.tar.gz: 277e1c323a916c085f4b45fed9ede685b1587246ace3e703a89b33038b59147f
 SHA512:
-  metadata.gz: f983701a46e36b8d189d80c6906868d91b3a35840b849cdcdc301ec8f660cc851de3ebbb045eb924dd8dd201b1aebe3fd2c8a69f1db8425b2bb2380d30b7b6b0
-  data.tar.gz: bb2f8d87c5fa5b3332cdcbdea5a9e411ddf3941bfcc12cc4e8b5693edb114aa7295f3ab63f627721fe3a87c860d1a4a42b7e3f3a066e498b1861522cea1a1999
+  metadata.gz: ee07c96b1a45d301d37b2c633e71ac176ca4859cf40d92cfd772d5549892a1edb64a74897270d9819f2ea0fe3f9a2a3916a447a65b60fd084100e06bcf86ef45
+  data.tar.gz: b963b62e1d1b86e89eb7d78c088881a9ae399fb529928fdb030ba921cd0d32f9b660529e160b1bb8f229d077fcc2a71df4cb90518f4a067e7fe2269447ed96dd

data/CHANGELOG.md

@@ -1,12 +1,45 @@
+## 2.2.2 (June 23, 2021)
+BUG FIXES:
+  - Fixed shared folder mount on the VM reboot
+  [[GH-391](https://github.com/Parallels/vagrant-parallels/pull/391)]
+
+## 2.2.1 (April 14, 2021)
+BUG FIXES:
+  - Fixed the compatibility with Vagrant 2.2.15
+  [[GH-386](https://github.com/Parallels/vagrant-parallels/pull/386)]
+
+## 2.2.0 (March 3, 2021)
+IMPROVEMENTS:
+  - Mount shared folders after manual VM reboot
+  [[GH-377](https://github.com/Parallels/vagrant-parallels/pull/377)]
+
+BUG FIXES:
+  - Fixed mount of shared folders with non-ASCII symbols in the name
+  [[GH-290](https://github.com/Parallels/vagrant-parallels/issues/290)]
+
+## 2.1.0 (November 25, 2020)
+BUG FIXES:
+  - Fixed the private network adapter workflow on macOS 11.0 Big Sur
+  [[GH-371](https://github.com/Parallels/vagrant-parallels/pull/371)]
+  - Fixed the concurrency issue with box unregister in multi-vm environment
+  [[GH-370](https://github.com/Parallels/vagrant-parallels/pull/370)]
+  - Fixed the `vagrant package` with custom `Vagrantfile`
+  [[GH-368](https://github.com/Parallels/vagrant-parallels/pull/368)]
+
+## 2.0.1 (April 23, 2019)
+BUG FIXES:
+  - Fixed the error message for host-only network collision
+  [[GH-340](https://github.com/Parallels/vagrant-parallels/issues/340)]
+
 ## 2.0.0 (November 19, 2018)
 BREAKING CHANGES:
   - **Linked Clone feature is enabled by default.**
   Now each time when you create a new virtual machine with `vagrant up` it is
   created as a linked clone of the box image (instead of the full clone, as it
   was before). Read more about it:
-  [Full Clone vs Linked Clone](http://parallels.github.io/vagrant-parallels/docs/configuration.html#linked_clone).
+  [Full Clone vs Linked Clone](https://parallels.github.io/vagrant-parallels/docs/configuration.html#linked_clone).
   - **Dropped support of Parallels Desktop 10**. It reached
-  [End-of-Life and End-of-Support](http://kb.parallels.com/eu/122533).
+  [End-of-Life and End-of-Support](https://kb.parallels.com/eu/122533).
 
 ## 1.7.8 (November 18, 2017)
 BUG FIXES:
@@ -82,7 +115,7 @@ BUG FIXES:
 ## 1.7.0 (November 15, 2016)
 BREAKING CHANGES:
   - **Dropped support of Parallels Desktop 8 and 9**. These versions have
-  reached their [End-of-Life and End-of-Support](http://kb.parallels.com/eu/122533).
+  reached their [End-of-Life and End-of-Support](https://kb.parallels.com/eu/122533).
   - **Removed customization options, which were previously deprecated:** [[GH-271](https://github.com/Parallels/vagrant-parallels/pull/271)]
     - "use_linked_clone" - use `linked_clone` instead.
     - "regen_box_uuid" - use `regen_src_uuid` instead.

data/README.md

@@ -3,16 +3,13 @@
 [![Build Status](https://travis-ci.org/Parallels/vagrant-parallels.svg?branch=master)](https://travis-ci.org/Parallels/vagrant-parallels)
 [![Code Climate](https://codeclimate.com/github/Parallels/vagrant-parallels.svg)](https://codeclimate.com/github/Parallels/vagrant-parallels)
 
-_Vagrant Parallels Provider_ is a plugin for [Vagrant](http://www.vagrantup.com),
-allowing to manage [Parallels Desktop](http://www.parallels.com/products/desktop/)
+_Vagrant Parallels Provider_ is a plugin for [Vagrant](https://www.vagrantup.com),
+allowing to manage [Parallels Desktop](https://www.parallels.com/products/desktop/)
 virtual machines on macOS hosts.
 
 ### Requirements
-- [Vagrant v1.8](http://www.vagrantup.com) or higher
-(_there are known issues with Vagrant v1.9.5
-[[GH-297](https://github.com/Parallels/vagrant-parallels/issues/297#issuecomment-304458691)]
-and v1.9.6 [[GH-301]](https://github.com/Parallels/vagrant-parallels/issues/301)_)
-- [Parallels Desktop 11 for Mac](http://www.parallels.com/products/desktop/) or higher
+- [Vagrant v1.9.7](https://www.vagrantup.com) or higher
+- [Parallels Desktop 11 for Mac](https://www.parallels.com/products/desktop/) or higher
 
 *Note:* Only **Pro** and **Business** editions of **Parallels Desktop for Mac**
 are compatible with this Vagrant provider.
@@ -24,11 +21,11 @@ The Parallels provider supports all basic Vagrant features, including Shared Fol
 Private and Public Networking, Forwarded ports and Vagrant Share.
 
 If you're just getting started with Vagrant, it is highly recommended that you
-read the official [Vagrant documentation](http://docs.vagrantup.com/v2/) first.
+read the official [Vagrant documentation](https://docs.vagrantup.com/v2/) first.
 
 ## Installation
-Make sure that you have [Parallels Desktop for Mac](http://www.parallels.com/products/desktop/)
-and [Vagrant](http://www.vagrantup.com/downloads) properly installed.
+Make sure that you have [Parallels Desktop for Mac](https://www.parallels.com/products/desktop/)
+and [Vagrant](https://www.vagrantup.com/downloads.html) properly installed.
 We recommend that you use the latest versions of these products.
 
 Parallels provider is a plugin for Vagrant. Run this command to install it:
@@ -40,12 +37,12 @@ $ vagrant plugin install vagrant-parallels
 ## Provider Documentation
 
 More information about the Parallels provider is available in
-[Vagrant Parallels Documentation](http://parallels.github.io/vagrant-parallels/docs/)
+[Vagrant Parallels Documentation](https://parallels.github.io/vagrant-parallels/docs/)
 
 We recommend you to start from these pages:
-* [Usage](http://parallels.github.io/vagrant-parallels/docs/usage.html)
-* [Getting Started](http://parallels.github.io/vagrant-parallels/docs/getting-started.html)
-* [Boxes](http://parallels.github.io/vagrant-parallels/docs/boxes/index.html)
+* [Usage](https://parallels.github.io/vagrant-parallels/docs/usage.html)
+* [Getting Started](https://parallels.github.io/vagrant-parallels/docs/getting-started.html)
+* [Boxes](https://parallels.github.io/vagrant-parallels/docs/boxes/index.html)
 
 ## Getting Help
 
@@ -56,6 +53,6 @@ please report it on the [Issue Tracker](https://github.com/Parallels/vagrant-par
 
 * Author: Youssef Shahin <yshahin@gmail.com>
 * Author: Mikhail Zholobov <legal90@gmail.com>
-* Copyright 2013-2018, Parallels International GmbH.
+* Copyright 2013-2020, Parallels International GmbH.
 
-Vagrant Parallels Provider is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).
+Vagrant Parallels Provider is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

data/lib/vagrant-parallels/action.rb

@@ -113,6 +113,7 @@ module VagrantPlugins
             b1.use Package
             b1.use Export
             b1.use PackageConfigFiles
+            b1.use PackageVagrantfile
           end
         end
       end
@@ -413,6 +414,7 @@ module VagrantPlugins
       autoload :Network, File.expand_path('../action/network', __FILE__)
       autoload :Package, File.expand_path('../action/package', __FILE__)
       autoload :PackageConfigFiles, File.expand_path('../action/package_config_files', __FILE__)
+      autoload :PackageVagrantfile, File.expand_path('../action/package_vagrantfile', __FILE__)
       autoload :PrepareCloneSnapshot, File.expand_path('../action/prepare_clone_snapshot', __FILE__)
       autoload :PrepareForwardedPortCollisionParams, File.expand_path('../action/prepare_forwarded_port_collision_params', __FILE__)
       autoload :PrepareNFSSettings, File.expand_path('../action/prepare_nfs_settings', __FILE__)

data/lib/vagrant-parallels/action/box_unregister.rb

@@ -53,9 +53,9 @@ module VagrantPlugins
             file.flush
           end
 
-          # Delete the lease file if we are the last who need this box.
+          # Delete the lease file if we were the last who needed this box.
           # Then the box image will be unregistered.
-          lease_file.delete if lease_file.read.chomp.to_i <= 1
+          lease_file.delete if lease_file.read.chomp.to_i <= 0
         end
 
         def unregister_box(env)

data/lib/vagrant-parallels/action/network.rb

@@ -291,7 +291,12 @@ module VagrantPlugins
             @env[:machine].provider.driver.read_bridged_interfaces.each do |interface|
               next if interface[:status] == 'Down'
               that_netaddr = IPAddr.new("#{interface[:ip]}/#{interface[:netmask]}")
-              raise Vagrant::Errors::NetworkCollision if netaddr.include? that_netaddr
+              if netaddr.include? that_netaddr
+                raise VagrantPlugins::Parallels::Errors::NetworkCollision,
+                  hostonly_netaddr: netaddr,
+                  bridge_netaddr:   that_netaddr,
+                  bridge_interface: interface[:name]
+              end
             end
           end
 

data/lib/vagrant-parallels/action/package_vagrantfile.rb

@@ -0,0 +1,33 @@
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module Parallels
+    module Action
+      class PackageVagrantfile
+        # For TemplateRenderer
+        include Vagrant::Util
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          @env = env
+          create_vagrantfile
+          @app.call(env)
+        end
+
+        # This method creates the auto-generated Vagrantfile at the root of the
+        # box. This Vagrantfile contains the MAC address so that the user doesn't
+        # have to worry about it.
+        def create_vagrantfile
+          File.open(File.join(@env["export.temp_dir"], "Vagrantfile"), "w") do |f|
+            f.write(TemplateRenderer.render("package_Vagrantfile", {
+              base_mac: @env[:machine].provider.driver.read_mac_address
+            }))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/cap/mount_options.rb

@@ -0,0 +1,50 @@
+require_relative "../util/unix_mount_helpers"
+
+module VagrantPlugins
+  module Parallels
+    module SyncedFolderCap
+      module MountOptions
+        extend VagrantPlugins::Parallels::Util::UnixMountHelpers
+
+        PRL_MOUNT_TYPE = "prl_fs".freeze
+
+        # Returns mount options for a parallels synced folder
+        #
+        # @param [Machine] machine
+        # @param [String] name of mount
+        # @param [String] path of mount on guest
+        # @param [Hash] hash of mount options
+        def self.mount_options(machine, name, guest_path, options)
+          mount_options = options.fetch(:mount_options, [])
+          detected_ids = detect_owner_group_ids(machine, guest_path, mount_options, options)
+          mount_uid = detected_ids[:uid]
+          mount_gid = detected_ids[:gid]
+
+          mount_options << "uid=#{mount_uid}"
+          mount_options << "gid=#{mount_gid}"
+          mount_options << "_netdev"
+          mount_options = mount_options.join(',')
+          return mount_options, mount_uid, mount_gid
+        end
+
+        def self.mount_type(machine)
+          return PRL_MOUNT_TYPE
+        end
+
+        ## We have to support 2 different expected interfaces of `mount_name` call:
+        ##   Vagrant < 2.2.15:   `def self.mount_name(machine, data)`
+        ##   Vagrant >= 2.2.15:  `def self.mount_name(machine, id, data)`
+        ## https://github.com/Parallels/vagrant-parallels/issues/384
+        def self.mount_name(*args)
+          if args.length >= 3
+            id = args[1]
+          else
+            id = args[-1][:guestpath]
+          end
+
+          id.gsub(/[*":<>?|\/\\]/,'_').sub(/^_/, '')
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/driver/base.rb

@@ -193,14 +193,13 @@ module VagrantPlugins
           end
         end
 
-        # Deletes any host only networks that aren't being used for anything.
+        # Deletes host-only networks that aren't being used by any virtual machine.
         def delete_unused_host_only_networks
           networks = read_virtual_networks
-          # 'Shared'(vnic0) and 'Host-Only'(vnic1) are default in Parallels Desktop
-          # They should not be deleted anyway.
+
+          # Exclude all host-only network interfaces which were not created by vagrant provider.
           networks.keep_if do |net|
-            net['Type'] == 'host-only' && net['Bound To'] &&
-              net['Bound To'].match(/^(?>vnic|Parallels Host-Only #)(\d+)$/)[1].to_i >= 2
+            net['Type'] == 'host-only' && net['Network ID'] =~ /^vagrant-vnet(\d+)$/
           end
 
           read_vms_info.each do |vm|
@@ -210,8 +209,8 @@ module VagrantPlugins
             end
           end
 
+          # Delete all unused network interfaces.
           networks.each do |net|
-            # Delete the actual host only network interface.
             execute_prlsrvctl('net', 'del', net['Network ID'])
           end
         end
@@ -496,7 +495,6 @@ module VagrantPlugins
         #
         # {
         #   name:     'Host-Only',     # Parallels Network ID
-        #   bound_to: 'vnic1',         # interface name
         #   ip:       '10.37.129.2',   # IP address of the interface
         #   netmask:  '255.255.255.0', # netmask associated with the interface
         #   status:   'Up'             # status of the interface
@@ -519,11 +517,9 @@ module VagrantPlugins
             }
 
             adapter = net_info['Parallels adapter']
-            if adapter && net_info['Bound To']
-              # In PD >= 10.1.2 there are new field names for an IP/Subnet
-              iface[:ip]       = adapter['IP address'] || adapter['IPv4 address']
-              iface[:netmask]  = adapter['Subnet mask'] || adapter['IPv4 subnet mask']
-              iface[:bound_to] = net_info['Bound To']
+            if adapter
+              iface[:ip]       = adapter['IPv4 address']
+              iface[:netmask]  = adapter['IPv4 subnet mask']
               iface[:status]   = 'Up'
 
               if adapter['IPv6 address'] && adapter['IPv6 subnet mask']
@@ -618,11 +614,9 @@ module VagrantPlugins
           }
           adapter = net_info['Parallels adapter']
 
-          if adapter && net_info['Bound To']
-            # In PD >= 10.1.2 there are new field names for an IP/Subnet
-            iface[:ip]       = adapter['IP address'] || adapter['IPv4 address']
-            iface[:netmask]  = adapter['Subnet mask'] || adapter['IPv4 subnet mask']
-            iface[:bound_to] = net_info['Bound To']
+          if adapter
+            iface[:ip]       = adapter['IPv4 address']
+            iface[:netmask]  = adapter['IPv4 subnet mask']
             iface[:status]   = 'Up'
           end
 

data/lib/vagrant-parallels/errors.rb

@@ -27,10 +27,6 @@ module VagrantPlugins
         error_key(:json_parse_error)
       end
 
-      class LinuxMountFailed < VagrantParallelsError
-        error_key(:linux_mount_failed)
-      end
-
       class LinuxPrlFsInvalidOptions < VagrantParallelsError
         error_key(:linux_prl_fs_invalid_options)
       end
@@ -39,6 +35,10 @@ module VagrantPlugins
         error_key(:mac_os_x_required)
       end
 
+      class NetworkCollision < VagrantParallelsError
+        error_key(:network_collision)
+      end
+
       class NetworkInvalidAddress < VagrantParallelsError
         error_key(:network_invalid_address)
       end
@@ -55,6 +55,10 @@ module VagrantPlugins
         error_key(:parallels_invalid_version)
       end
 
+      class ParallelsMountFailed < VagrantParallelsError
+        error_key(:parallels_mount_failed)
+      end
+
       class ParallelsNotDetected < VagrantParallelsError
         error_key(:parallels_not_detected)
       end
@@ -104,4 +108,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vagrant-parallels/guest_cap/linux/mount_parallels_shared_folder.rb

@@ -1,7 +1,19 @@
+require 'shellwords'
+
+require_relative "../../util/unix_mount_helpers"
+
 module VagrantPlugins
   module Parallels
     module GuestLinuxCap
       class MountParallelsSharedFolder
+        extend VagrantPlugins::Parallels::Util::UnixMountHelpers
+
+        # Mounts Parallels Desktop shared folder on linux guest
+        #
+        # @param [Machine] machine
+        # @param [String] name of mount
+        # @param [String] path of mount on guest
+        # @param [Hash] hash of mount options
         def self.mount_parallels_shared_folder(machine, name, guestpath, options)
           # Sanity check for mount options: we are not supporting
           # VirtualBox-specific 'fmode' and 'dmode' options
@@ -15,83 +27,38 @@ module VagrantPlugins
             end
           end
 
-          expanded_guest_path = machine.guest.capability(
-            :shell_expand_guest_path, guestpath)
+          guest_path = Shellwords.escape(guestpath)
+          mount_type = options[:plugin].capability(:mount_type)
 
-          mount_commands = []
+          @@logger.debug("Mounting #{name} (#{options[:hostpath]} to #{guestpath})")
 
-          if options[:owner].is_a? Integer
-            mount_uid = options[:owner]
-          else
-            mount_uid = "`id -u #{options[:owner]}`"
-          end
-
-          if options[:group].is_a? Integer
-            mount_gid = options[:group]
-            mount_gid_old = options[:group]
-          else
-            mount_gid = "`getent group #{options[:group]} | cut -d: -f3`"
-            mount_gid_old = "`id -g #{options[:group]}`"
-          end
-
-          # First mount command uses getent to get the group
-          mount_options = "-o uid=#{mount_uid},gid=#{mount_gid}"
-          mount_options += ",#{options[:mount_options].join(',')}" if options[:mount_options]
-          mount_commands << "mount -t prl_fs #{mount_options} #{name} #{expanded_guest_path}"
-
-          # Second mount command uses the old style `id -g`
-          mount_options = "-o uid=#{mount_uid},gid=#{mount_gid_old}"
-          mount_options += ",#{options[:mount_options].join(',')}" if options[:mount_options]
-          mount_commands << "mount -t prl_fs #{mount_options} #{name} #{expanded_guest_path}"
-
-          # Clear prior symlink if exists
-          if machine.communicate.test("test -L #{expanded_guest_path}")
-            machine.communicate.sudo("rm #{expanded_guest_path}")
-          end
+          mount_options, mount_uid, mount_gid = options[:plugin].capability(:mount_options, name, guest_path, options)
+          mount_command = "mount -t #{mount_type} -o #{mount_options} #{name} #{guest_path}"
 
           # Create the guest path if it doesn't exist
-          machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
+          machine.communicate.sudo("mkdir -p #{guest_path}")
 
           # Attempt to mount the folder. We retry here a few times because
           # it can fail early on.
-          attempts = 0
-          while true
-            success = true
-
-            mount_commands.each do |command|
-              no_such_device = false
-              status = machine.communicate.sudo(command, error_check: false) do |type, data|
-                no_such_device = true if type == :stderr && data =~ /No such device/i
-              end
-
-              success = status == 0 && !no_such_device
-              break if success
-            end
-
-            break if success
-
-            attempts += 1
-            if attempts > 10
-              raise VagrantPlugins::Parallels::Errors::LinuxMountFailed,
-                command: mount_commands.join("\n")
-            end
-
-            sleep 2
+          stderr = ""
+          retryable(on: Errors::ParallelsMountFailed, tries: 3, sleep: 5) do
+            machine.communicate.sudo(mount_command,
+              error_class: Errors::ParallelsMountFailed,
+              error_key: :parallels_mount_failed,
+              command: mount_command,
+              output: stderr,
+            ) { |type, data| stderr = data if type == :stderr }
           end
 
-          # Emit an upstart event if we can
-          machine.communicate.sudo <<-EOH.gsub(/^ {10}/, "")
-            if command -v /sbin/init && /sbin/init 2>/dev/null --version | grep upstart; then
-              /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}
-            fi
-          EOH
+          emit_upstart_notification(machine, guest_path)
         end
 
         def self.unmount_parallels_shared_folder(machine, guestpath, options)
-          result = machine.communicate.sudo(
-            "umount #{guestpath}", error_check: false)
+          guest_path = Shellwords.escape(guestpath)
+
+          result = machine.communicate.sudo("umount #{guest_path}", error_check: false)
           if result == 0
-            machine.communicate.sudo("rmdir #{guestpath}", error_check: false)
+            machine.communicate.sudo("rmdir #{guest_path}", error_check: false)
           end
         end
 

data/lib/vagrant-parallels/plugin.rb

@@ -103,6 +103,21 @@ module VagrantPlugins
         SyncedFolder
       end
 
+      synced_folder_capability(:parallels, "mount_name") do
+        require_relative "cap/mount_options"
+        SyncedFolderCap::MountOptions
+      end
+
+      synced_folder_capability(:parallels, "mount_options") do
+        require_relative "cap/mount_options"
+        SyncedFolderCap::MountOptions
+      end
+
+      synced_folder_capability(:parallels, "mount_type") do
+        require_relative "cap/mount_options"
+        SyncedFolderCap::MountOptions
+      end
+
       # This initializes the internationalization strings.
       def self.setup_i18n
         I18n.load_path << File.expand_path('locales/en.yml', Parallels.source_root)

data/lib/vagrant-parallels/synced_folder.rb

@@ -9,8 +9,8 @@ module VagrantPlugins
           machine.provider_config.functional_psf
       end
 
-      def enable(machine, folders, _opts)
-        # Export the shared folders to the VM
+      def prepare(machine, folders, _opts)
+        # Setup shared folder definitions in the VM config.
         defs = []
         folders.each do |id, data|
           hostpath = data[:hostpath]
@@ -19,16 +19,15 @@ module VagrantPlugins
           end
 
           defs << {
-            name: os_friendly_id(id),
+            name: data[:plugin].capability(:mount_name, id, data),
             hostpath: hostpath.to_s,
           }
         end
 
-        # We should prepare only folders with unique hostpath values.
-        # Anyway, duplicates will be mounted later.
-        defs.uniq! { |d| d[:hostpath] }
         driver(machine).share_folders(defs)
+      end
 
+      def enable(machine, folders, _opts)
         # short guestpaths first, so we don't step on ourselves
         folders = folders.sort_by do |id, data|
           if data[:guestpath]
@@ -39,8 +38,6 @@ module VagrantPlugins
           end
         end
 
-        shf_config = driver(machine).read_shared_folders
-
         # Parallels Shared Folder services can override Vagrant synced folder
         # configuration. These services should be pre-configured.
         if machine.guest.capability?(:prepare_psf_services)
@@ -49,12 +46,8 @@ module VagrantPlugins
 
         # Go through each folder and mount
         machine.ui.output(I18n.t('vagrant.actions.vm.share_folders.mounting'))
-        folders.each do |_ , data|
-          # Parallels specific: get id from the VM setting
-          # It allows to mount one host folder more then one time [GH-105]
-          id = shf_config.key(data[:hostpath])
-
-          if data[:guestpath] and id
+        folders.each do |id , data|
+          if data[:guestpath]
             # Guest path specified, so mount the folder to specified point
             machine.ui.detail(I18n.t('vagrant.actions.vm.share_folders.mounting_entry',
                                      guestpath: data[:guestpath],
@@ -70,7 +63,11 @@ module VagrantPlugins
 
             # Mount the actual folder
             machine.guest.capability(
-                :mount_parallels_shared_folder, id, data[:guestpath], data)
+              :mount_parallels_shared_folder,
+              data[:plugin].capability(:mount_name, id, data),
+              data[:guestpath],
+              data
+            )
           else
             # If no guest path is specified, then automounting is disabled
             machine.ui.detail(I18n.t('vagrant.actions.vm.share_folders.nomount_entry',
@@ -89,7 +86,7 @@ module VagrantPlugins
         end
 
         # Remove the shared folders from the VM metadata
-        names = folders.map { |id, _data| os_friendly_id(id) }
+        names = folders.map { |id, data| data[:plugin].capability(:mount_name, id, data) }
         driver(machine).unshare_folders(names)
       end
 
@@ -103,11 +100,6 @@ module VagrantPlugins
       def driver(machine)
         machine.provider.driver
       end
-
-      def os_friendly_id(id)
-        # Replace chars *, ", :, <, >, ?, |, /, \
-        id.gsub(/[*":<>?|\/\\]/,'_').sub(/^_/, '')
-      end
     end
   end
 end

data/lib/vagrant-parallels/util/unix_mount_helpers.rb

@@ -0,0 +1,121 @@
+require "shellwords"
+require "vagrant/util/retryable"
+
+module VagrantPlugins
+  module Parallels
+    module Util
+      module UnixMountHelpers
+
+        def self.extended(klass)
+          if !klass.class_variable_defined?(:@@logger)
+            klass.class_variable_set(:@@logger, Log4r::Logger.new(klass.name.downcase))
+          end
+          klass.extend Vagrant::Util::Retryable
+        end
+
+        def detect_owner_group_ids(machine, guest_path, mount_options, options)
+          mount_uid = find_mount_options_id("uid", mount_options)
+          mount_gid = find_mount_options_id("gid", mount_options)
+
+          if mount_uid.nil?
+            if options[:owner].to_i.to_s == options[:owner].to_s
+              mount_uid = options[:owner]
+              self.class_variable_get(:@@logger).debug("Owner user ID (provided): #{mount_uid}")
+            else
+              output = {stdout: '', stderr: ''}
+              uid_command = "id -u #{options[:owner]}"
+              machine.communicate.execute(uid_command,
+                error_class: Errors::ParallelsMountFailed,
+                error_key: :parallels_mount_failed,
+                command: uid_command,
+                output: output[:stderr]
+              ) { |type, data| output[type] << data if output[type] }
+              mount_uid = output[:stdout].chomp
+              self.class_variable_get(:@@logger).debug("Owner user ID (lookup): #{options[:owner]} -> #{mount_uid}")
+            end
+          else
+            machine.ui.warn "Detected mount owner ID within mount options. (uid: #{mount_uid} guestpath: #{guest_path})"
+          end
+
+          if mount_gid.nil?
+            if options[:group].to_i.to_s == options[:group].to_s
+              mount_gid = options[:group]
+              self.class_variable_get(:@@logger).debug("Owner group ID (provided): #{mount_gid}")
+            else
+              begin
+                output = {stdout: '', stderr: ''}
+                gid_command = "getent group #{options[:group]}"
+                machine.communicate.execute(gid_command,
+                  error_class: Errors::ParallelsMountFailed,
+                  error_key: :parallels_mount_failed,
+                  command: gid_command,
+                  output: output[:stderr]
+                ) { |type, data| output[type] << data if output[type] }
+                mount_gid = output[:stdout].split(':').at(2).to_s.chomp
+                self.class_variable_get(:@@logger).debug("Owner group ID (lookup): #{options[:group]} -> #{mount_gid}")
+              rescue Vagrant::Errors::ParallelsMountFailed
+                if options[:owner] == options[:group]
+                  self.class_variable_get(:@@logger).debug("Failed to locate group `#{options[:group]}`. Group name matches owner. Fetching effective group ID.")
+                  output = {stdout: ''}
+                  result = machine.communicate.execute("id -g #{options[:owner]}",
+                    error_check: false
+                  ) { |type, data| output[type] << data if output[type] }
+                  mount_gid = output[:stdout].chomp if result == 0
+                  self.class_variable_get(:@@logger).debug("Owner group ID (effective): #{mount_gid}")
+                end
+                raise unless mount_gid
+              end
+            end
+          else
+            machine.ui.warn "Detected mount group ID within mount options. (gid: #{mount_gid} guestpath: #{guest_path})"
+          end
+          {:gid => mount_gid, :uid => mount_uid}
+        end
+
+        def find_mount_options_id(id_name, mount_options)
+          id_line = mount_options.detect{|line| line.include?("#{id_name}=")}
+          if id_line
+            match = id_line.match(/,?#{Regexp.escape(id_name)}=(?<option_id>\d+),?/)
+            found_id = match["option_id"]
+            updated_id_line = [
+              match.pre_match,
+              match.post_match
+            ].find_all{|string| !string.empty?}.join(',')
+            if updated_id_line.empty?
+              mount_options.delete(id_line)
+            else
+              idx = mount_options.index(id_line)
+              mount_options.delete(idx)
+              mount_options.insert(idx, updated_id_line)
+            end
+          end
+          found_id
+        end
+
+        def emit_upstart_notification(machine, guest_path)
+          # Emit an upstart event if we can
+          machine.communicate.sudo <<-EOH.gsub(/^ {12}/, "")
+              if command -v /sbin/init && /sbin/init 2>/dev/null --version | grep upstart; then
+                /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{guest_path}
+              fi
+            EOH
+        end
+
+        def merge_mount_options(base, overrides)
+          base = base.join(",").split(",")
+          overrides = overrides.join(",").split(",")
+          b_kv = Hash[base.map{|item| item.split("=", 2) }]
+          o_kv = Hash[overrides.map{|item| item.split("=", 2) }]
+          merged = {}.tap do |opts|
+            (b_kv.keys + o_kv.keys).uniq.each do |key|
+              opts[key] = o_kv.fetch(key, b_kv[key])
+            end
+          end
+          merged.map do |key, value|
+            [key, value].compact.join("=")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '2.0.0'
+    VERSION = '2.2.2'
   end
 end

data/locales/en.yml

@@ -45,19 +45,19 @@ en:
         disk is inconsistent, please remove it from the VM configuration.
 
         Disk image path: %{path}
-      linux_mount_failed: |-
-        Failed to mount folders in Linux guest. This is usually because
-        the "prl_fs" file system is not available. Please verify that
-        Parallels Tools are properly installed in the guest and
-        can work properly. If so, the VM reboot can solve a problem.
-        The command attempted was:
-
-        %{command}
       linux_prl_fs_invalid_options: |-
         Failed to mount folders in Linux guest. You've specified mount options
         which are not supported by "prl_fs" file system.
 
         Invalid mount options: %{options}
+      network_collision: |-
+        The specified host network collides with a non-hostonly network!
+        This will cause your specified IP to be inaccessible. Please change
+        the IP or name of your host only network so that it no longer matches that of
+        a bridged or non-hostonly network.
+
+        Host-only Network Address: '%{hostonly_netaddr}'
+        Bridged Network '%{bridge_interface}': '%{bridge_netaddr}'
       network_invalid_address: |-
         Network settings specified in your Vagrantfile are invalid:
 
@@ -73,6 +73,19 @@ en:
           %{output}
 
         This is an internal error that should be reported as a bug.
+      parallels_mount_failed: |-
+        Vagrant was unable to mount Parallels Desktop shared folders. This is usually
+        because the filesystem "prl_fs" is not available. This filesystem is
+        made available via the Parallels Tools and kernel module.
+        Please verify that these guest tools are properly installed in the
+        guest. This is not a bug in Vagrant and is usually caused by a faulty
+        Vagrant box. For context, the command attempted was:
+
+        %{command}
+
+        The error output from the command was:
+
+        %{output}
       parallels_no_room_for_high_level_network: |-
         There is no available slots on the Parallels Desktop VM for the configured
         high-level network interfaces. "private_network" and "public_network"
@@ -101,12 +114,12 @@ en:
         only with Pro and Business editions of Parallels Desktop. Other editions
         do not have command line functionality and can not be used with Vagrant.
 
-        Please upgrade your installation: http://parallels.com/desktop
+        Please upgrade your installation: https://parallels.com/desktop
       parallels_unsupported_version: |-
         Vagrant has detected that you have a version of Parallels Desktop for Mac
         installed that is not supported. Vagrant Parallels provider is compatible
         only with Parallels Desktop 11 or later.
-        Please upgrade your installation: http://parallels.com/desktop
+        Please upgrade your installation: https://parallels.com/desktop
 
         Note: Starting since Parallels Desktop 11 for Mac, Vagrant Parallels
         provider can be only used with Pro or Business edition of Parallels

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Mikhail Zholobov
 - Youssef Shahin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 description: Enables Vagrant to manage Parallels virtual machines.
 email:
 - mzholobov@parallels.com
@@ -98,6 +98,7 @@ files:
 - lib/vagrant-parallels/action/network.rb
 - lib/vagrant-parallels/action/package.rb
 - lib/vagrant-parallels/action/package_config_files.rb
+- lib/vagrant-parallels/action/package_vagrantfile.rb
 - lib/vagrant-parallels/action/prepare_clone_snapshot.rb
 - lib/vagrant-parallels/action/prepare_forwarded_port_collision_params.rb
 - lib/vagrant-parallels/action/prepare_nfs_settings.rb
@@ -111,6 +112,7 @@ files:
 - lib/vagrant-parallels/action/snapshot_save.rb
 - lib/vagrant-parallels/action/suspend.rb
 - lib/vagrant-parallels/cap.rb
+- lib/vagrant-parallels/cap/mount_options.rb
 - lib/vagrant-parallels/config.rb
 - lib/vagrant-parallels/driver/base.rb
 - lib/vagrant-parallels/driver/meta.rb
@@ -127,13 +129,14 @@ files:
 - lib/vagrant-parallels/provider.rb
 - lib/vagrant-parallels/synced_folder.rb
 - lib/vagrant-parallels/util/compile_forwarded_ports.rb
+- lib/vagrant-parallels/util/unix_mount_helpers.rb
 - lib/vagrant-parallels/version.rb
 - locales/en.yml
-homepage: http://github.com/Parallels/vagrant-parallels
+homepage: https://github.com/Parallels/vagrant-parallels
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,9 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: vagrant-parallels
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Parallels provider for Vagrant.
 test_files: []