vagrant-vbguest 0.23.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de7e56db32055d21a641c0fff261a9dbff9f7faf6d1857b5eb5da239b7cbe0d6
-  data.tar.gz: 332c697c6db4673e288874aeaf61ecd65233256a40635ea81216019f4269396a
+  metadata.gz: 1fecae71af01b753dc6ad5a6dd65a70dc4e4c39dbdaaeb5205c9bb88542e1efd
+  data.tar.gz: dfc9860b431a6bea6371aa5e4f51fcd30c6ec7ff74b96d4d09bbea1327ba1deb
 SHA512:
-  metadata.gz: f1041e643b17bce30c935e3c753dcb05c54b90e51edfd2de1844ccba5656d721837a9b0d7955d99dfd271810f2cb36355d03bed21714e52e43c8cf7161ec5174
-  data.tar.gz: b7a8fba5885fbca588c44dcf112eeacdd7b92604cb33378e1f59e75ab60bdfdab6c0d037a8cf725214eb3c01e3ea5c5a5b56d1f0f9e4ec149abad46f7a849fea
+  metadata.gz: 105dcfe234ee744cee3d5f21797e8bf43fa835c148c6816aff92805a996cf1074afece27b99b5f25e4d41a61e0f4a4cfaaa6c1e99b49f30a901eb6e233a4d0ad
+  data.tar.gz: 8f5684c37b0b59bd5d2465ab74d21ccf0169f3756a102e70c5066f5cc62ccb65f06a231b8e6d78a0b1caadec2e85c2990b67d7a78c7f25a4c2b8b631d6acaf46

data/.github/dependabot.yml

@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "vagrant"

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## 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.
+- Fix RHEL8 perl vs. perl-interpreter [GH-368]
+- On RedHad, use `dnf` instead of `yum` if available. [GH-368]
+- Fix incorrect re-use of installer_* options.
+
+## 0.25.0 (2020-09-26)
+
+- Renames mainline branch from "master" to "main"
+- Fix not detecting running GuestAdditions on some systems [GH-347], [GH-376]. Thanks @Morac2 for [GH-377]
+- Fixes package installation issues on CentOS 8.
+  CentOS installers no longe use the `--enablerepo` parameter when running `yum` to install packages.
+  Thanks @ghoneycutt for [GH-384]
+
+## 0.24.0 (2020-04-29)
+
+No code changes to 0.24.0.beta1
+
+## 0.24.0.beta1 (2020-04-28)
+
+- Add a new configuration `installer_options`, as an optional way to pass options to Installer classes.
+- Add new `installer_options` for the CentOS Installer. Thanks @pedrofurtado for [GH-373]
+  + `allow_kernel_upgrade`: Will update the kernel and reboots the box
+  + `reboot_timeout`: Optionally, set the max amount of seconds to wait after reboot
+
 ## 0.23.0 (2020-01-05)
 
 - Fix Oracle Linux Installer. Installs `elfutils-libelf-devel`. [GH-364], @fribeiro1 [GH-365]

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at info@dotless.de. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

data/Gemfile

@@ -4,16 +4,16 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  if ENV["VAGRANT_VERSION"]
-    gem "vagrant", :git => "https://github.com/hashicorp/vagrant.git", tag: "v#{ENV["VAGRANT_VERSION"]}"
-  elsif ENV["VAGRANT_LOCAL"]
-    gem "vagrant", path: ENV["VAGRANT_LOCAL"]
+  if ENV['VAGRANT_VERSION']
+    gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git', tag: "v#{ENV['VAGRANT_VERSION']}"
+  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", "~> 10.0"
+  gem 'rake', '>= 12.3.3'
 end
 
 group :plugins do
-  gem "vagrant-vbguest", path: "."
+  gem 'vagrant-vbguest', path: '.'
 end

data/Readme.md

@@ -4,7 +4,7 @@
 
 [![Join the chat at https://gitter.im/dotless-de/vagrant-vbguest](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dotless-de/vagrant-vbguest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Code Climate](https://codeclimate.com/github/dotless-de/vagrant-vbguest.svg)](https://codeclimate.com/github/dotless-de/vagrant-vbguest)
-[![Inline docs](http://inch-ci.org/github/dotless-de/vagrant-vbguest.svg?branch=master)](http://inch-ci.org/github/dotless-de/vagrant-vbguest)
+[![Inline docs](http://inch-ci.org/github/dotless-de/vagrant-vbguest.svg?branch=main)](http://inch-ci.org/github/dotless-de/vagrant-vbguest)
 [![Gem Version](https://badge.fury.io/rb/vagrant-vbguest.svg)](https://badge.fury.io/rb/vagrant-vbguest)
 
 
@@ -58,8 +58,53 @@ vbguest will try to autodetect the best option for your system. WTF? see below.
 * `no_remote` (Boolean, default: `false`) : Whether to _not_ download the iso file from a remote location. This includes any `http` location!
 * `installer` (`VagrantVbguest::Installers::Base`, optional) : Reference to a (custom) installer class
 * `installer_arguments` (Array, default: `['--nox11']`) : List of additional arguments to pass to the installer. eg: `%w{--nox11 --force}` would execute `VBoxLinuxAdditions.run install --nox11 --force`
+* `installer_options` (Hash, default: `{}`) : Configure how a Installer internally works. Should be set on a `vm` level.
+* `installer_hooks` (Hash, default: `{}`) : Configure scripts to be run before/after installer steps.
 * `yes` (Boolean or String, default: `true`): Wheter to pipe `yes` to the installer. If `true`, executes `yes | VBoxLinuxAdditions.run install`. With `false`, the command is executed without `yes`. You can also put in a string here for `yes` (e.g. `no` to refuse all messages)
 
+
+#### Installer Specific Options (`installer_options`)
+
+Those settings are specific for OS-specific installer. Especially in a multi-box environment, you should put those options on the box configuration like this:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define "my_cent_os_box" do |c|
+    c.box = "centos/8"
+    c.vbguest.installer_options = { allow_kernel_upgrade: true }
+  end
+end
+```
+
+Note that box-specific settings overwrite earlier settings:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vbguest.installer_options = { foo: 1, bar: 2 }
+
+  config.vm.define "a" do |box_config|
+    # not setting any `installer_options` will inherit the "global" ones
+    # installer_options => { foo: 1, bar: 2 }
+  end
+
+  config.vm.define "b" do |box_config|
+    # setting any `installer_options` will start from scratch
+    box_config.vbguest.installer_options[:zort] = 3 # => { zort: 3 }
+  end
+
+  config.vm.define "c" do |box_config|
+    # however, you can explicitly merge the global config
+    box_config.vbguest.installer_options = config.vbguest.installer_options.merge(zort: 3) # => { foo: 1, bar: 2, zort: 3 }
+  end
+end
+```
+
+
+##### CentOS
+
+* `:allow_kernel_upgrade` (default: `false`): If `true`, instead of trying to find matching the matching kernel-devel package to the installed kernel version, the kernel will be updated and the (now matching) up-to-date kernel-devel will be installed. __NOTE__: This will trigger a reboot of the box.
+* `:reboot_timeout` (default: `300`): Maximum number of seconds to wait for the box to reboot after a kernel upgrade.
+
 #### Global Configuration
 
 Using [Vagrantfile Load Order](https://www.vagrantup.com/docs/vagrantfile/#load-order-and-merging) you may change default configuration values.
@@ -84,6 +129,26 @@ VagrantVbguest::Config.auto_update = false
 Settings in a project's `Vagrantfile` will overwrite those setting. When executed as a command, command line arguments will overwrite all of the above.
 
 
+#### Installer Hooks (`installer_hooks`)
+
+Additionally to the build-in `installer_options`, you can configure to execute scripts around the install steps `install`, `rebuild` and `start`.
+Accepts either a single command or and array of commands. Box-specific settings overwrite earlier settings, just like with `installer_options`.
+
+Use this make changes to the guest, for example to install specific dependencies or tweak the network setup.
+
+* `before_install`/`after_install`: Runs before/after the install step. That is before uploading the iso file into the guest and after unmounting the iso file.
+* `before_rebuild`/`after_rebuild`: Runs before/after the installer runs a command to let the GuestAdditions rebuild itself.
+* `before_start`/`after_start`: Runs before/after the installer runs a command to start the GuestAdditions service.
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define "my_cent_os_box" do |c|
+    c.vbguest.installer_hooks[:before_install] = ["yum install -y epel-release", "sleep 1"]
+  end
+end
+```
+
+
 ### Running as a middleware
 
 Running as a middleware is the default way of using *vagrant-vbguest*. 
@@ -258,14 +323,14 @@ end
 
 If you find yourself copying the same installer in each of your vagrant project, it might be a good idea to make it a plugin itself. Like vagrant-vbguest itself, installers can be [distributed as ruby gems](http://guides.rubygems.org/publishing/)
 
-This project contains a [sample installer gem](https://github.com/dotless-de/vagrant-vbguest/tree/master/testdrive/vagrant-vbguest-unikorn) which might serve as an boilerplate. 
+This project contains a [sample installer gem](https://github.com/dotless-de/vagrant-vbguest/tree/main/testdrive/vagrant-vbguest-unikorn) which might serve as an boilerplate. 
 
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/dotless-de/vagrant-vbguest.
 
-For the forseeable future, no more pull requests will be accepted which add new guest support/installers. Please build your gem as a plugin to vbguest (see "Very Advanced Usage" section of this file). In fact, please open a pull request to remove support for a guest system if feel confident that your solution is better.
+For the foreseeable future, no more pull requests will be accepted which add new guest support/installers. Please build your gem as a plugin to vbguest (see "Very Advanced Usage" section of this file). In fact, please open a pull request to remove support for a guest system if feel confident that your solution is better.
 
 
 ## Known Issues

data/SECURITY.md

@@ -0,0 +1,10 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest version of vagrant-vbguest is supported and will receive security updates.
+
+## Reporting a Vulnerability
+
+Download GPG key from: https://keybase.io/fnordfish/pgp_keys.asc (fingerprint `B3CA4DF4D703CBDFFF211CB8A8B249A38963D0B6`)
+Write an gpg encrypted email to `vbguest-security@dotless.de`

data/VERSION

@@ -1 +1 @@
-0.23.0
+0.27.0

data/lib/vagrant-vbguest/config.rb

@@ -4,7 +4,8 @@ module VagrantVbguest
 
     module Attributes
       attr_accessor :auto_update, :auto_reboot, :no_install, :no_remote,
-                    :installer, :installer_arguments, :allow_downgrade,
+                    :installer, :installer_arguments, :installer_options,
+                    :installer_hooks, :allow_downgrade,
                     :iso_path, :iso_upload_path, :iso_mount_point, :yes
     end
 
@@ -16,6 +17,8 @@ module VagrantVbguest
       def no_install;  @no_install.nil?  ? false : @no_install  end
       def no_remote;   @no_remote.nil?   ? false : @no_remote   end
       def installer_arguments; @installer_arguments.nil? ? '--nox11' : @installer_arguments end
+      def installer_options; @installer_options ||= {} end
+      def installer_hooks; @installer_hooks ||= {} end
       def yes; @yes.nil? ? true : @yes end
 
       def iso_path
@@ -32,7 +35,9 @@ module VagrantVbguest
     def auto_reboot; @auto_reboot.nil? ? self.class.auto_reboot : @auto_reboot end
     def no_install;  @no_install.nil?  ? self.class.no_install  : @no_install  end
     def no_remote;   @no_remote.nil?   ? self.class.no_remote   : @no_remote   end
-    def installer_arguments; @installer_arguments.nil? ? self.class.installer_arguments : @installer_arguments end
+    def installer_arguments; @installer_arguments.nil? ? self.class.installer_arguments.dup : @installer_arguments end
+    def installer_options; @installer_options ||= self.class.installer_options.dup end
+    def installer_hooks; @installer_hooks ||= self.class.installer_hooks.dup end
     def yes; @yes.nil? ? self.class.yes : @yes end
 
     def iso_path
@@ -47,6 +52,8 @@ module VagrantVbguest
       {
         :installer => installer,
         :installer_arguments => installer_arguments,
+        :installer_options => installer_options,
+        :installer_hooks => installer_hooks,
         :iso_path => iso_path,
         :iso_upload_path => iso_upload_path,
         :iso_mount_point => iso_mount_point,

data/lib/vagrant-vbguest/installer.rb

@@ -60,8 +60,10 @@ module VagrantVbguest
       installer = guest_installer
       raise NoInstallerFoundError, :method => 'install' if !installer
 
-      installer.install do |type, data|
-        @env.ui.info(data, :prefix => false, :new_line => false)
+      with_hooks(:install) do
+        installer.install do |type, data|
+          @env.ui.info(data, :prefix => false, :new_line => false)
+        end
       end
     ensure
       cleanup
@@ -71,8 +73,10 @@ module VagrantVbguest
       installer = guest_installer
       raise NoInstallerFoundError, :method => 'rebuild' if !installer
 
-      installer.rebuild do |type, data|
-        @env.ui.info(data, :prefix => false, :new_line => false)
+      with_hooks(:rebuild) do
+        installer.rebuild do |type, data|
+          @env.ui.info(data, :prefix => false, :new_line => false)
+        end
       end
     end
 
@@ -80,8 +84,10 @@ module VagrantVbguest
       installer = guest_installer
       raise NoInstallerFoundError, :method => 'manual start' if !installer
 
-      installer.start do |type, data|
-        @env.ui.info(data, :prefix => false, :new_line => false)
+      with_hooks(:start) do
+        installer.start do |type, data|
+          @env.ui.info(data, :prefix => false, :new_line => false)
+        end
       end
     end
 
@@ -145,8 +151,32 @@ 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)
+      run_hook(:"before_#{step_name}")
+      ret = yield
+      run_hook(:"after_#{step_name}")
+
+      ret
+    end
+
+    def run_hook(hook_name)
+      hooks = @options.dig(:installer_hooks, hook_name)
+
+      return if !hooks || hooks.empty?
+
+      @vm.ui.info I18n.t("vagrant_vbguest.installer_hooks.#{hook_name}")
+      Array(hooks).each do |l|
+        @vm.communicate.sudo(l) do |type, data|
+          @env.ui.info(data, :prefix => false, :new_line => false)
+        end
+      end
+    end
   end
 end

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

@@ -181,6 +181,10 @@ module VagrantVbguest
         version
       end
 
+      def installer_options
+        options[:installer_options] || {}
+      end
+
       # Helper to yield a warning message to the user, that the installation
       # will start _now_.
       # The message includes the host and installer version strings.
@@ -232,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/centos.rb

@@ -8,12 +8,27 @@ module VagrantVbguest
 
       # Install missing deps and yield up to regular linux installation
       def install(opts=nil, &block)
-        install_kernel_deps(opts, &block)
+        if upgrade_kernel?
+          upgrade_kernel(opts, &block)
+        else
+          install_kernel_deps(opts, &block)
+        end
         super
       end
 
+      def installer_options
+        @installer_options ||= {
+          allow_kernel_upgrade: false,
+          reboot_timeout: 300
+        }.merge!(super)
+      end
+
       protected
 
+      def upgrade_kernel?
+        installer_options[:allow_kernel_upgrade]
+      end
+
       def install_kernel_deps(opts=nil, &block)
         unless has_kernel_devel_info?
           update_release_repos(opts, &block)
@@ -31,7 +46,7 @@ module VagrantVbguest
       def has_rel_repo?
         unless instance_variable_defined?(:@has_rel_repo)
           rel = release_version
-          @has_rel_repo = communicate.test("yum repolist --enablerepo=C#{rel}-base --enablerepo=C#{rel}-updates")
+          @has_rel_repo = communicate.test('yum repolist')
         end
         @has_rel_repo
       end
@@ -54,16 +69,30 @@ module VagrantVbguest
 
       def install_kernel_devel(opts=nil, &block)
         rel = has_rel_repo? ? release_version : '*'
-        cmd = "yum install -y kernel-devel-`uname -r` --enablerepo=C#{rel}-base --enablerepo=C#{rel}-updates"
+        cmd = 'yum install -y kernel-devel-`uname -r`'
         communicate.sudo(cmd, opts, &block)
       end
 
+      def upgrade_kernel(opts=nil, &block)
+        communicate.sudo('yum update -y kernel', opts, &block)
+        communicate.sudo('yum install -y kernel-devel', opts, &block)
+
+        env.ui.info(I18n.t("vagrant_vbguest.centos.rebooting", vm_name: vm.name))
+        communicate.sudo('shutdown -r now', opts, &block)
+
+        sleep_guard = installer_options[:reboot_timeout]
+        begin
+          sleep 10
+          sleep_guard -= 10
+        end while sleep_guard >= 0 && !@vm.communicate.ready?
+      end
+
       def dependencies
-        if has_kernel_devel_info?
+        if !upgrade_kernel? && has_kernel_devel_info?
           # keep the original redhat dependencies
           super
         else
-          # we should have installed kernel-devel-`uname -r` via install_kernel_devel
+          # we should have installed kernel-devel(-`uname -r`) via install_kernel_devel or upgrade_kernel
           ['gcc', 'binutils', 'make', 'perl', 'bzip2', 'elfutils-libelf-devel'].join(' ')
         end
       end

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

@@ -24,7 +24,7 @@ module VagrantVbguest
 
     protected
       def install_dependencies_cmd
-        "apt-get install -y #{dependencies}"
+        "DEBIAN_FRONTEND=noninteractive apt-get install -y #{dependencies}"
       end
 
       def dependencies

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\([^\s]*O[^\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/redhat.rb

@@ -16,7 +16,11 @@ module VagrantVbguest
 
     protected
       def install_dependencies_cmd
-        "yum install -y #{dependencies}"
+        "#{package_manager_cmd} install -y #{dependencies}"
+      end
+
+      def package_manager_cmd
+        "`bash -c 'type -p dnf || type -p yum'`"
       end
 
       def dependencies
@@ -26,11 +30,22 @@ module VagrantVbguest
           'gcc',
           'binutils',
           'make',
-          'perl',
+          perl_dependency,
           'bzip2',
           'elfutils-libelf-devel'
         ].join(' ')
       end
+
+      def perl_dependency
+        unless instance_variable_defined?(:@perl_dependency)
+          @perl_dependency = if communicate.test("#{package_manager_cmd} list perl-interpreter")
+            "perl-interpreter"
+          else
+            "perl"
+          end
+        end
+        @perl_dependency
+      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",

data/locales/en.yml

@@ -34,6 +34,14 @@ en:
       ok: "[%{vm_name}] GuestAdditions %{guest_version} running --- OK."
       skipped_downgrade: "GuestAdditions are newer than your host but, downgrades are disabled. Skipping."
 
+    installer_hooks:
+      before_install: "Executing pre-install hooks"
+      after_install: "Executing post-install hooks"
+      before_rebuild: "Executing pre-rebuild hooks"
+      after_rebuild: "Executing post-rebuild hooks"
+      before_start: "Executing pre-start hooks"
+      after_start: "Executing post-start hooks"
+
     errors:
       autodetect_iso_path: |-
         Could not locate a local Virtualbox Guest Additions iso file.

data/locales/en_centos.yml

@@ -0,0 +1,4 @@
+en:
+  vagrant_vbguest:
+    centos:
+      rebooting: "[%{vm_name}] Rebooting after kernel upgrade."

data/vagrant-vbguest.gemspec

@@ -23,4 +23,10 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/dotless-de/vagrant-vbguest/issues",
+    "changelog_uri" => "https://github.com/dotless-de/vagrant-vbguest/blob/main/CHANGELOG.md",
+    "documentation_uri" => "http://rubydoc.info/gems/vagrant-vbguest",
+    "source_code_uri" => "https://github.com/dotless-de/vagrant-vbguest"
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Robert Schulze
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -66,13 +66,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/stale.yml"
 - ".gitignore"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
 - Rakefile
 - Readme.md
+- SECURITY.md
 - VERSION
 - lib/vagrant-vbguest.rb
 - lib/vagrant-vbguest/command.rb
@@ -101,13 +104,18 @@ files:
 - lib/vagrant-vbguest/middleware.rb
 - lib/vagrant-vbguest/version.rb
 - locales/en.yml
+- locales/en_centos.yml
 - locales/en_windows.yml
 - vagrant-vbguest.gemspec
 homepage: https://github.com/dotless-de/vagrant-vbguest
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/dotless-de/vagrant-vbguest/issues
+  changelog_uri: https://github.com/dotless-de/vagrant-vbguest/blob/main/CHANGELOG.md
+  documentation_uri: http://rubydoc.info/gems/vagrant-vbguest
+  source_code_uri: https://github.com/dotless-de/vagrant-vbguest
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM
 test_files: []