vagrant-parallels 2.2.4 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3069fda3f88a140459a882ee8e9afbc59079e49f6b05d1d13f4505c0c86df4b7
-  data.tar.gz: 6862da240eac05e3fd35e79f2c9dd4ef47b0fcd32b4558d0ae66f99fe3e1fc2c
+  metadata.gz: 7035cf285af41cc2b66992971c09b3e77f68da5bb33ca3a8ef7586e4eec65334
+  data.tar.gz: '08a191cd2af6f7a5fbb626a16375be955cae4a386123519fb1db077b16345f9b'
 SHA512:
-  metadata.gz: 295b8617a454d081415e7e0fb68fb5485b0581d948c8481c415816079307e1fe1e43be5af695d1f2d98c74f2b5fb6e6b88a515397163aecf79795f7a0bf3c1ba
-  data.tar.gz: b368159177283a7b5202fc12c03d7781cbdc58e32685a22910cbbb86a79dc8691f4e0af279c28f05231da355f137be4e11d1131a1e96b2c8415ae1c49c3b41c4
+  metadata.gz: ac10bedbc9ecfd38984e710de98f634dd9c97572e5f6b8bf27f9a5f91f6d6af9cce0ae7152642b4d37ab2a9c49708189ae7ae9cb108b00c6710f44af9ca19921
+  data.tar.gz: 6fea796a741e76daefb24bd2ebbc86fc5a248c3665c347fb3d004c3f277ec6dc84d6c3bd2b3b4577d4e68e49f76d06abea4cf49fede0d198266dd0fa3cfce781

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.2.6 (December 19, 2022)
+BUG FIXES:
+  - Fix the macOS VMs support on ARM-based Mac
+  [[GH-429](https://github.com/Parallels/vagrant-parallels/pull/429)]
+
+## 2.2.5 (February 22, 2022)
+BUG FIXES:
+  - Fixed Parallels Tool installation on M1 hosts with arm64
+  [[GH-416](https://github.com/Parallels/vagrant-parallels/pull/416)]
+
 ## 2.2.4 (August 18, 2021)
 BUG FIXES:
   - Fixed running the provisioner on "vagrant up --provision"

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

@@ -39,13 +39,13 @@ module VagrantPlugins
         protected
 
         def box_path(env)
-          pvm = Dir.glob(env[:machine].box.directory.join('*.pvm')).first
+          res = Dir.glob(env[:machine].box.directory.join('*.{pvm,macvm}')).first
 
-          if !pvm
+          if !res
             raise Errors::BoxImageNotFound, name: env[:machine].box.name
           end
 
-          pvm
+          res
         end
 
         def box_id(env)
@@ -120,9 +120,6 @@ module VagrantPlugins
             f.write(env[:clone_id])
           end
 
-          # Convert template to VM (compatibility with old-styled boxes)
-          env[:machine].provider.driver.execute_prlctl(
-            'set', env[:clone_id], '--template', 'off')
         end
       end
     end

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

@@ -4,6 +4,7 @@ module VagrantPlugins
   module Parallels
     module Action
       class Import
+        include VagrantPlugins::Parallels::Util::Common
         @@lock = Mutex.new
 
         def initialize(app, env)
@@ -24,7 +25,8 @@ module VagrantPlugins
           end
 
           # Linked clones are supported only for PD 11 and higher
-          if env[:machine].provider_config.linked_clone
+          # Linked clones are not supported in macvms
+          if env[:machine].provider_config.linked_clone and !is_macvm(env)
             # Linked clone creation should not be concurrent [GH-206]
             options[:snapshot_id] = env[:clone_snapshot_id]
             options[:linked] = true

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

@@ -6,6 +6,7 @@ module VagrantPlugins
   module Parallels
     module Action
       class PrepareCloneSnapshot
+        include VagrantPlugins::Parallels::Util::Common
         @@lock = Mutex.new
 
         def initialize(app, env)
@@ -19,6 +20,12 @@ module VagrantPlugins
             return @app.call(env)
           end
 
+          if is_macvm(env)
+            #Ignore, since macvms doesn't support snapshot creation
+            @logger.info('Snapshot creation is not supported yet for macOS ARM Guests, skip snapshot preparing')
+            return @app.call(env)
+          end
+
           # If we're not doing a linked clone, snapshots don't matter
           if !env[:machine].provider_config.linked_clone
             return @app.call(env)

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

@@ -4,6 +4,8 @@ module VagrantPlugins
   module Parallels
     module Action
       class SaneDefaults
+        include VagrantPlugins::Parallels::Util::Common
+
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_parallels::action::sanedefaults')
           @app = app
@@ -27,6 +29,9 @@ module VagrantPlugins
         private
 
         def default_settings
+          # Options defined below are not supported for `*.macvm` VMs
+          return {} if is_macvm(@env)
+
           {
             tools_autoupdate: 'no',
             on_shutdown: 'close',

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

@@ -434,11 +434,13 @@ module VagrantPlugins
         #
         # @param [String] guest_os Guest os type: "linux", "darwin" or "windows"
         # @return [String] Path to the ISO.
-        def read_guest_tools_iso_path(guest_os)
-          guest_os = guest_os.to_sym
+        def read_guest_tools_iso_path(guest_os, arch=nil)
+          guest_os = (guest_os + (['arm', 'arm64', 'aarch64'].include?(arch.to_s.strip) ? '_arm' : '')).to_sym
           iso_name = {
             linux: 'prl-tools-lin.iso',
+            linux_arm: 'prl-tools-lin-arm.iso',
             darwin: 'prl-tools-mac.iso',
+            darwin_arm: 'prl-tools-mac-arm.iso',
             windows: 'PTIAgent.exe'
           }
           return nil unless iso_name[guest_os]

data/lib/vagrant-parallels/guest_cap/darwin/install_parallels_tools.rb

@@ -5,8 +5,11 @@ module VagrantPlugins
 
         def self.install_parallels_tools(machine)
           machine.communicate.tap do |comm|
+            arch = ''
+            comm.execute("uname -p") { |type, data| arch << data if type == :stdout }
+
             tools_iso_path = File.expand_path(
-              machine.provider.driver.read_guest_tools_iso_path('darwin'),
+              machine.provider.driver.read_guest_tools_iso_path("darwin", arch),
               machine.env.root_path
             )
             remote_file = '/tmp/prl-tools-mac.iso'

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

@@ -1,3 +1,5 @@
+require 'log4r'
+
 module VagrantPlugins
   module Parallels
     module GuestLinuxCap
@@ -8,8 +10,11 @@ module VagrantPlugins
             machine.communicate.sudo('ptiagent-cmd --install')
           else
             machine.communicate.tap do |comm|
+              arch = ''
+              comm.execute("uname -p") { |type, data| arch << data if type == :stdout }
+
               tools_iso_path = File.expand_path(
-                machine.provider.driver.read_guest_tools_iso_path('linux'),
+                machine.provider.driver.read_guest_tools_iso_path("linux", arch),
                 machine.env.root_path
               )
               remote_file = '/tmp/prl-tools-lin.iso'

data/lib/vagrant-parallels/plugin.rb

@@ -168,6 +168,7 @@ module VagrantPlugins
 
     module Util
       autoload :CompileForwardedPorts, File.expand_path('../util/compile_forwarded_ports', __FILE__)
+      autoload :Common, File.expand_path('../util/common', __FILE__)
     end
   end
 end

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

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Parallels
+    module Util
+      module Common
+
+        # Determines whether the VM's box contains a macOS guest for an Apple Silicon host.
+        # In this case the image file ends with '.macvm' instead of '.pvm'
+        def is_macvm(env)
+          return !!Dir.glob(env[:machine].box.directory.join('*.macvm')).first
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '2.2.4'
+    VERSION = '2.2.6'
   end
 end

data/locales/en.yml

@@ -16,7 +16,7 @@ en:
         Box VM config: "%{config}"
 
       box_image_not_found: |-
-        Parallels VM image (*.pvm) could not be found in the directory of
+        Parallels VM image (*.pvm or *.macvm) could not be found in the directory of
         '%{name}' box. This is usually because the image has been removed manually.
         Please remove the box, re-add it, and try again.
       dhcp_leases_file_not_accessible: |-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.6
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -128,6 +128,7 @@ files:
 - lib/vagrant-parallels/plugin.rb
 - lib/vagrant-parallels/provider.rb
 - lib/vagrant-parallels/synced_folder.rb
+- lib/vagrant-parallels/util/common.rb
 - lib/vagrant-parallels/util/compile_forwarded_ports.rb
 - lib/vagrant-parallels/util/unix_mount_helpers.rb
 - lib/vagrant-parallels/version.rb