vagrant-vbguest 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7a6d0a4fb842515ecb1dd74ecb969b916c9673aaefabad4f866e84a4fadcdd5
-  data.tar.gz: c799100151565c5bced4e1efdc1af7e833fb8e01b1ab6ec74ec94d01e7f05676
+  metadata.gz: 1fecae71af01b753dc6ad5a6dd65a70dc4e4c39dbdaaeb5205c9bb88542e1efd
+  data.tar.gz: dfc9860b431a6bea6371aa5e4f51fcd30c6ec7ff74b96d4d09bbea1327ba1deb
 SHA512:
-  metadata.gz: 14ae4c8c9751d61040c7658d487271a2fdcd7f55f734a1487921c15d05cc97f175aafafde2e1787cadd48c05259f4dcfde4aac3e810c0b1723dd228d3e41af8f
-  data.tar.gz: 5791807d0b50e929402798b41647306c1edb40e434b25c9264c633bb2c76f8c4b02e18012488a5ef136fee0616777c46daaee044fcdaca066241f8d9372f1a06
+  metadata.gz: 105dcfe234ee744cee3d5f21797e8bf43fa835c148c6816aff92805a996cf1074afece27b99b5f25e4d41a61e0f4a4cfaaa6c1e99b49f30a901eb6e233a4d0ad
+  data.tar.gz: 8f5684c37b0b59bd5d2465ab74d21ccf0169f3756a102e70c5066f5cc62ccb65f06a231b8e6d78a0b1caadec2e85c2990b67d7a78c7f25a4c2b8b631d6acaf46

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.27.0 (2020-11-15)
+
+- Un-mounting the guest additions iso will now take place in the cleanup step [GH-393]
+- Running detection now checks for vboxguest and vboxsf kernel module. [GH-392], Fixes [GH-387]
+
 ## 0.26.0 (2020-10-30)
 
 - Add a new configuration `installer_hooks` allows to configure arbitrary scripts to be run on the guest before/after installer steps are executed.

data/Gemfile

@@ -9,7 +9,7 @@ group :development do
   elsif ENV['VAGRANT_LOCAL']
     gem 'vagrant', path: ENV['VAGRANT_LOCAL']
   else
-    gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git'
+    gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git', branch: "main"
   end
   gem 'rake', '>= 12.3.3'
 end

data/VERSION

@@ -1 +1 @@
-0.26.0
+0.27.0

data/lib/vagrant-vbguest/installer.rb

@@ -151,7 +151,11 @@ module VagrantVbguest
     end
 
     def cleanup
-      @guest_installer.cleanup if @guest_installer
+      return unless @guest_installer
+
+      @guest_installer.cleanup do |type, data|
+        @env.ui.info(data, :prefix => false, :new_line => false)
+      end
     end
 
     def with_hooks(step_name)

data/lib/vagrant-vbguest/installers/base.rb

@@ -236,12 +236,13 @@ module VagrantVbguest
 
       # A helper method to delete the uploaded GuestAdditions iso file
       # from the guest box
-      def cleanup
+      def cleanup(opts, &block)
         unless options[:no_cleanup]
           @host.cleanup
-          communicate.execute("test -f #{tmp_path} && rm #{tmp_path}", :error_check => false) do |type, data|
-            env.ui.error(data.chomp, :prefix => false)
-          end
+
+          opts = (opts || {}).merge(:error_check => false)
+          block ||= proc { |type, data| env.ui.error(data.chomp, :prefix => false) }
+          communicate.execute("test -f #{tmp_path} && rm #{tmp_path}", opts, &block)
         end
       end
     end

data/lib/vagrant-vbguest/installers/linux.rb

@@ -67,7 +67,6 @@ module VagrantVbguest
         mount_iso(opts, &block)
         execute_installer(opts, &block)
         start(opts, &block)
-        unmount_iso(opts, &block) unless options[:no_cleanup]
       end
 
       # @param opts [Hash] Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
@@ -78,7 +77,7 @@ module VagrantVbguest
         opts = {
           :sudo => true
         }.merge(opts || {})
-        communicate.test('grep -qE "^vboxguest\s.+\s" /proc/modules && ls /lib/modules/`uname -r`/misc/vboxsf.ko*', opts, &block)
+        communicate.test('grep -qE "^vboxguest\b.*vboxsf\b" /proc/modules', opts, &block)
       end
 
       # This overrides {VagrantVbguest::Installers::Base#guest_version}
@@ -269,6 +268,13 @@ module VagrantVbguest
         env.ui.info(I18n.t("vagrant_vbguest.unmounting_iso", :mount_point => mount_point))
         communicate.sudo("umount #{mount_point}", opts, &block)
       end
+
+      def cleanup(opts=nil, &block)
+        unless options[:no_cleanup]
+          unmount_iso(opts, &block)
+          super
+        end
+      end
     end
   end
 end

data/lib/vagrant-vbguest/installers/windows.rb

@@ -51,7 +51,6 @@ module VagrantVbguest
         upload(iso_file)
         mount_iso(opts, &block)
         execute_installer(opts, &block)
-        unmount_iso(opts, &block) unless options[:no_cleanup]
       end
 
       def reboot_after_install?(opts = nil, &block)
@@ -113,6 +112,13 @@ module VagrantVbguest
         communicate.execute("Remove-Item -Path #{tmp_path}", opts, &block)
       end
 
+      def cleanup(opts = nil, &block)
+        unless options[:no_cleanup]
+          unmount_iso(opts, &block)
+          super
+        end
+      end
+
       def yield_installation_error_warning(path_to_installer)
         @env.ui.warn I18n.t(
           "vagrant_vbguest.windows.install_error",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Robert Schulze
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine