vagrant-parallels 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3069fda3f88a140459a882ee8e9afbc59079e49f6b05d1d13f4505c0c86df4b7
-  data.tar.gz: 6862da240eac05e3fd35e79f2c9dd4ef47b0fcd32b4558d0ae66f99fe3e1fc2c
+  metadata.gz: ede8c43d4ad31a4ad5cec8ecf94158e93a825ea959bf4a2cbf5da1b1428108ad
+  data.tar.gz: 0e56a44dcbd181577e69ef04525be3278a86fd6c0ccb41139635a19176d3768e
 SHA512:
-  metadata.gz: 295b8617a454d081415e7e0fb68fb5485b0581d948c8481c415816079307e1fe1e43be5af695d1f2d98c74f2b5fb6e6b88a515397163aecf79795f7a0bf3c1ba
-  data.tar.gz: b368159177283a7b5202fc12c03d7781cbdc58e32685a22910cbbb86a79dc8691f4e0af279c28f05231da355f137be4e11d1131a1e96b2c8415ae1c49c3b41c4
+  metadata.gz: a283f0ebedc0074f277fd902725d6724b1db7a7c822621885f5df8bba6197abe9e3e6a914a5cfc8146c4abd187c04a81c59ff02f364c058ffa3fbe7f7fc634be
+  data.tar.gz: 8af828330dc40be03eefcd34834e2eb1d7490ba7ed7331d01dbec224f148ca9743d961cc2510c889d97112f50bc3f7d0db0047c0c3cb5cc03316ed256ed665a3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 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-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri