vagrant-vbguest 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3648ade616bfaddafaf75b6a48be6e8744e34b78ee97aa312c351a199fe1341c
-  data.tar.gz: 303b9330920b71330cbf16faf9b8230e0a50046017bfc1c14099c75bf50a8546
+  metadata.gz: cee12b08e10b796656c3f2ed706fa3a7757f85b597d2a9d09bc6ab802c0a6242
+  data.tar.gz: 1cdedccd2a2f38e19a945102b8cce02299f47c6ef459f59abc8c362041742198
 SHA512:
-  metadata.gz: ae76c53cfee6318338cb2ee6c51759855d9891a6b645baff5262e7632a747c1a92c29f6b87b3e96a8cfa1f38484e8cc8451d28060cdc06803487c1d4eb210597
-  data.tar.gz: 98a67568739b232630c73ec73cdbea72201687cb16e5cc746bf63755d2ba95b2ccc1b894c3b32926d0374ff8bd355849d3aadfd41adace9ea04821efb39ae29d
+  metadata.gz: 1323fbd94936e520062e0a6e6ca6759ac0e22367d5c9e3760a0af749e23e0db038a3d2777421a182b3d9baba81b8fbef94905861bd1e121aed43e39782a4d366
+  data.tar.gz: 4a7256387e9c82e4f29f12ad3286c07eb735dc36a2c969f8fde419a8ecc5aaa633c15d7e6fb5f787ebf5ad184968f639d9395ef780cbbdfebd0922def9f377a3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Changelog
+
+## 0.32.0 (2023-12-17)
+
+- Fix testing for running GuestAdditions on Linux, when reading `/proc/modules` returns in
+  multiple chunks. Thanks @kubasov-s [GH-436]
+- Use RedHat installer for AlmaLinux. Thanks @alexgit2k [GH-431]
+- Don't unmount the GuestAdditions iso when it's not mounted. Ignore errors during un-mounting. [GH-434]
+
 ## 0.31.0 (2022-11-28)
 
 - Use the CentOS installer when detecting Rocky Linux. Thanks @djflux [GH-424]

data/Readme.md

@@ -1,5 +1,10 @@
 # vagrant-vbguest
 
+**Please note that as of 2023-12-17, this project is archived and will not receive further updates or support from me.**  
+**However, the existing codebase will remain available for reference and use under the project's open-source license.**
+
+---
+
 *vagrant-vbguest* is a [Vagrant](http://vagrantup.com) plugin which automatically installs the host's VirtualBox Guest Additions on the guest system.
 
 [![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)
@@ -7,7 +12,6 @@
 [![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)
 
-
 ## Installation
 
 Requires vagrant 1.3 or later
@@ -15,12 +19,12 @@ Requires vagrant 1.3 or later
 ### Vagrant ≥ 1.3
 
 ```bash
-$ vagrant plugin install vagrant-vbguest
+vagrant plugin install vagrant-vbguest
 ```
 
 ## Configuration / Usage
 
-If you're lucky, *vagrant-vbguest* does not require any configuration. 
+If you're lucky, *vagrant-vbguest* does not require any configuration.
 However, here is an example of `Vagrantfile`:
 
 ```ruby
@@ -51,18 +55,28 @@ The default URI for the actual iso download is: `https://download.virtualbox.org
 vbguest will try to autodetect the best option for your system. WTF? see below.
 * `iso_upload_path` (String, default: `/tmp`): A writeable directory where to put the VBoxGuestAdditions.iso file on the guest system.
 * `iso_mount_point` (String, default: `/mnt`): Where to mount the VBoxGuestAdditions.iso file on the guest system.
-* `auto_update` (Boolean, default: `true`) : Whether to check the correct additions version on each start (where start is _not_ resuming a box).
+* `auto_update` (Boolean, default: `true`) : Whether to check the correct additions version on each start (where start is *not* resuming a box).
 * `auto_reboot` (Boolean, default: `true` when running as a middleware, `false` when running as a command) : Whether to reboot the box after GuestAdditions has been installed, but not loaded.
-* `allow_downgrade` (Boolean, default: `true`) : Allow to install an older version of Guest Additions onto the guest. (Eg. your are running a host with VirtualBox 5 and the box is already on 6).
+* `allow_downgrade` (Boolean, default: `true`) : Allow to install an older version of Guest Additions onto the guest. (Eg. you are running a host with VirtualBox 5 and the box is already on 6).
 * `no_install` (Boolean, default: `false`) : Whether to check the correct additions version only. This will warn you about version mis-matches, but will not try to install anything.
-* `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
+* `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 or a named installer.
+  Build-in named installers are:
+  * `:arch`, `:archlinux`, `:arch_linux` : Arch Linux
+  * `:centos`, `:cent_os` : CentOS
+  * `:debian` : Debian
+  * `:fedora` : Fedora
+  * `:opensuse`, `:open_suse` : openSUSE
+  * `:oracle`, `:oraclelinux`, `:oracle_linux` : Oracle Linux
+  * `:redhat`, `:red_hat` : Red Hat
+  * `:suse` : SUSE
+  * `:ubuntu` : Ubuntu
+  * `:windows` : Windows
 * `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:
@@ -98,6 +112,7 @@ Vagrant.configure("2") do |config|
   end
 end
 ```
+
 ##### Linux
 
 This option is available on all Linux type installers.
@@ -109,10 +124,10 @@ This option is available on all Linux type installers.
 * `: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.
 * `:enablerepo`: (default: `false`) Configure `yum --enablerepo` settings. Possible values are:
-  - Single String: `"C*-base"` converts to `--enablerepo=C*-base`
-  - Array of Strings: `['C*-base', 'C*-updates']` converts to `--enablerepo=C*-base --enablerepo=C*-updates`
-  - `true`: Enables `C${release_version}-base` and `C${release_version}-updates` with release_version read from `/etc/centos-release` if the repo exists, otherwise `*`.
-  - `false`: Does not set any `--enablerepo`
+  * Single String: `"C*-base"` converts to `--enablerepo=C*-base`
+  * Array of Strings: `['C*-base', 'C*-updates']` converts to `--enablerepo=C*-base --enablerepo=C*-updates`
+  * `true`: Enables `C${release_version}-base` and `C${release_version}-updates` with release_version read from `/etc/centos-release` if the repo exists, otherwise `*`.
+  * `false`: Does not set any `--enablerepo`
 
 #### Global Configuration
 
@@ -137,7 +152,6 @@ 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`.
@@ -157,11 +171,10 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-
 ### Running as a middleware
 
-Running as a middleware is the default way of using *vagrant-vbguest*. 
-It will run automatically right after the box started. This is each time the box boots, i.e. `vagrant up` or `vagrant reload`. 
+Running as a middleware is the default way of using *vagrant-vbguest*.
+It will run automatically right after the box started. This is each time the box boots, i.e. `vagrant up` or `vagrant reload`.
 It won't run on `vagrant resume` (or `vagrant up` a suspended box) to save you some time resuming a box.
 
 You may switch off the middleware by setting the vm's config `vbguest.auto_update` to `false`.
@@ -169,59 +182,60 @@ This is a per box setting. On multi vm environments you need to set that for eac
 
 When *vagrant-vbguest* is running it will provide you some logs:
 
-    [...]
-    [default] Booting VM...
-    [default] Booting VM...
-    [default] Waiting for VM to boot. This can take a few minutes.
-    [default] VM booted and ready for use!
-    [default] GuestAdditions versions on your host (4.2.6) and guest (4.1.0) do not match.
-    stdin: is not a tty
-    Reading package lists...
-    Building dependency tree...
-    Reading state information...
-    The following extra packages will be installed:
-      fakeroot linux-headers-2.6.32-33 patch
-
-    [...]
-
-    [default] Copy iso file /Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso into the box /tmp/VBoxGuestAdditions.iso
-    stdin: is not a tty
-    [default] Installing Virtualbox Guest Additions 4.2.6 - guest version is 4.1.0
-    stdin: is not a tty
-    Verifying archive integrity... All good.
-    Uncompressing VirtualBox 4.2.6 Guest Additions for Linux...........
-    VirtualBox Guest Additions installer
-    Removing installed version 4.1.0 of VirtualBox Guest Additions...
-    tar: Record size = 8 blocks
-    Removing existing VirtualBox DKMS kernel modules ...done.
-    Removing existing VirtualBox non-DKMS kernel modules ...done.
-    Building the VirtualBox Guest Additions kernel modules ...done.
-    Doing non-kernel setup of the Guest Additions ...done.
-    You should restart your guest to make sure the new modules are actually used
-
-    Installing the Window System drivers ...fail!
-    (Could not find the X.Org or XFree86 Window System.)
-    stdin: is not a tty
-    [default] Restarting VM to apply changes...
-    [default] Attempting graceful shutdown of VM...
-    [default] Booting VM...
-    [default] Waiting for VM to boot. This can take a few minutes.
-    [default] VM booted and ready for use!
-    [default] Configuring and enabling network interfaces...
-    [default] Setting host name...
-    [default] Mounting shared folders...
-    [default] -- v-root: /vagrant
-    [default] -- v-csc-1: /tmp/vagrant-chef-1/chef-solo-1/cookbooks
-    [default] Running provisioner: Vagrant::Provisioners::ChefSolo...
-    [default] Generating chef JSON and uploading...
-    [default] Running chef-solo...
-    [...]
-
+```log
+[...]
+[default] Booting VM...
+[default] Booting VM...
+[default] Waiting for VM to boot. This can take a few minutes.
+[default] VM booted and ready for use!
+[default] GuestAdditions versions on your host (4.2.6) and guest (4.1.0) do not match.
+stdin: is not a tty
+Reading package lists...
+Building dependency tree...
+Reading state information...
+The following extra packages will be installed:
+  fakeroot linux-headers-2.6.32-33 patch
+
+[...]
+
+[default] Copy iso file /Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso into the box /tmp/VBoxGuestAdditions.iso
+stdin: is not a tty
+[default] Installing Virtualbox Guest Additions 4.2.6 - guest version is 4.1.0
+stdin: is not a tty
+Verifying archive integrity... All good.
+Uncompressing VirtualBox 4.2.6 Guest Additions for Linux...........
+VirtualBox Guest Additions installer
+Removing installed version 4.1.0 of VirtualBox Guest Additions...
+tar: Record size = 8 blocks
+Removing existing VirtualBox DKMS kernel modules ...done.
+Removing existing VirtualBox non-DKMS kernel modules ...done.
+Building the VirtualBox Guest Additions kernel modules ...done.
+Doing non-kernel setup of the Guest Additions ...done.
+You should restart your guest to make sure the new modules are actually used
+
+Installing the Window System drivers ...fail!
+(Could not find the X.Org or XFree86 Window System.)
+stdin: is not a tty
+[default] Restarting VM to apply changes...
+[default] Attempting graceful shutdown of VM...
+[default] Booting VM...
+[default] Waiting for VM to boot. This can take a few minutes.
+[default] VM booted and ready for use!
+[default] Configuring and enabling network interfaces...
+[default] Setting host name...
+[default] Mounting shared folders...
+[default] -- v-root: /vagrant
+[default] -- v-csc-1: /tmp/vagrant-chef-1/chef-solo-1/cookbooks
+[default] Running provisioner: Vagrant::Provisioners::ChefSolo...
+[default] Generating chef JSON and uploading...
+[default] Running chef-solo...
+[...]
+```
 
 The plugin's part starts at `[default] Installing Virtualbox Guest Additions 4.1.14 - guest's version is 4.1.1`, telling you that:
 
-* the guest addition of the box *default* is outdated (or mismatching) 
-* which guest additions iso file will be used 
+* the guest addition of the box *default* is outdated (or mismatching)
+* which guest additions iso file will be used
 * which installer script will be used
 * all the VirtualBox Guest Additions installer output.
 
@@ -229,20 +243,21 @@ No worries on the `Installing the Window System drivers ...fail!`. Most dev boxe
 
 When everything is fine, and no update is needed, you see log like:
 
-    ...
-    [default] Booting VM...
-    [default] Waiting for VM to boot. This can take a few minutes.
-    [default] VM booted and ready for use!
-    [default] GuestAdditions 4.2.6 running --- OK.
-    ...
-
+```log
+[...]
+[default] Booting VM...
+[default] Waiting for VM to boot. This can take a few minutes.
+[default] VM booted and ready for use!
+[default] GuestAdditions 4.2.6 running --- OK.
+[...]
+```
 
 ### Running as a Command
 
 When you switched off the middleware auto update, or you have a box up and running you may also run the installer manually.
 
 ```bash
-$ vagrant vbguest [vm-name] [--do start|rebuild|install] [--status] [-f|--force] [-b|--auto-reboot] [-R|--no-remote] [--iso VBoxGuestAdditions.iso] [--no-cleanup]
+vagrant vbguest [vm-name] [--do start|rebuild|install] [--status] [-f|--force] [-b|--auto-reboot] [-R|--no-remote] [--iso VBoxGuestAdditions.iso] [--no-cleanup]
 ```
 
 For example, when you just updated VirtualBox on your host system, you should update the guest additions right away. However, you may need to reload the box to get the guest additions working.
@@ -250,43 +265,46 @@ For example, when you just updated VirtualBox on your host system, you should up
 If you want to check the guest additions version, without installing, you may run:
 
 ```bash
-$ vagrant vbguest --status
+vagrant vbguest --status
 ```
 
 Telling you either about a version mismatch:
 
-    [default] GuestAdditions versions on your host (4.2.6) and guest (4.1.0) do not match.
+```log
+[default] GuestAdditions versions on your host (4.2.6) and guest (4.1.0) do not match.
+```
 
 or a match:
 
-    [default] GuestAdditions 4.2.6 running --- OK.
-
+```log
+[default] GuestAdditions 4.2.6 running --- OK.
+```
 
 The `auto-reboot` is turned off by default when running as a command. Vbguest will suggest you to reboot the box when needed. To turn it on simply pass the `--auto-reboot` parameter:
 
 ```bash
-$ vagrant vbguest --auto-reboot
+vagrant vbguest --auto-reboot
 ```
 
 You can also pass vagrant's `reload` options like:
 
 ```bash
-$ vagrant vbguest --auto-reboot --no-provision
+vagrant vbguest --auto-reboot --no-provision
 ```
 
 When running the install step manually like this: `vagrant vbguest --do install`, adding `--no-cleanup` keeps the downloaded, uploaded files and mounted iso in their place. Happy debugging ;)
 
 ### ISO autodetection
 
-*vagrant-vbguest* will try to autodetect a VirtualBox GuestAdditions iso file on your system, which usually matches your installed version of VirtualBox. If it cannot find one, it downloads one from the web (virtualbox.org).   
+*vagrant-vbguest* will try to autodetect a VirtualBox GuestAdditions iso file on your system, which usually matches your installed version of VirtualBox. If it cannot find one, it downloads one from the web (virtualbox.org).  
 Those places will be checked in order:
 
 1. Checks your VirtualBox "Virtual Media Manager" for a DVD called "VBoxGuestAdditions.iso"
 2. Guess by your host operating system:
-  * for linux : `/usr/share/virtualbox/VBoxGuestAdditions.iso`
-  * for Mac : `/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso`
-  * for Windows : `%PROGRAMFILES%/Oracle/VirtualBox/VBoxGuestAdditions.iso`
 
+* for linux : `/usr/share/virtualbox/VBoxGuestAdditions.iso`
+* for Mac : `/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso`
+* for Windows : `%PROGRAMFILES%/Oracle/VirtualBox/VBoxGuestAdditions.iso`
 
 ### Automatic reboot
 
@@ -294,7 +312,6 @@ The VirtualBox GuestAdditions Installer will try to load the newly built kernel
 
 Hence, vbguest will check for a loaded kernel module after the installation has finished and reboots the box, if it could not find one.
 
-
 ## Advanced Usage
 
 vagrant-vbguest provides installers for generic linux and debian/ubuntu.  
@@ -327,21 +344,18 @@ Vagrant::Config.run do |config|
 end
 ```
 
-
 ### Extending vbguest (aka Very Advanced Usage)
 
 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/main/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.
+Bug reports and pull requests are welcome on GitHub at <https://github.com/dotless-de/vagrant-vbguest>.
 
 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
 
 * The installer script, which mounts and runs the GuestAdditions Installer Binary, works on Linux only. Most likely it will run on most Unix-like platforms.

data/VERSION

@@ -1 +1 @@
-0.31.0
+0.32.0

data/lib/vagrant-vbguest/installer.rb

@@ -26,12 +26,30 @@ module VagrantVbguest
       # specific version of a distribution should use heigher
       # priority numbers.
       #
+      # @param installer_key [Symbol] A key to identify the Installer class.
       # @param installer_class [Class] A reference to the Installer class.
       # @param prio [Fixnum] Priority describing how specific the Installer matches. (default: `5`)
-      def register(installer_class, prio = 5)
+      def register(*args)
+        installer_key = nil
+        installer_class = nil
+        prio = 5
+
+        if args.first.is_a?(Symbol) || args.first.is_a?(String)
+          installer_key   = args.first.to_s
+          installer_class = args[1]
+          prio            = args[2] if args[2]
+        else
+          warn "DEPRECATION: Passing Installer class directly to Installer.register is deprecated. Please use a registration identifier as first argument. `Installer.register(:my_system, MySystemInstaller, 1)`"
+          installer_class = args.first
+          prio            = args[1] if args[1]
+        end
+
         @installers ||= {}
-        @installers[prio] ||= []
+        @installers[prio] ||= Set.new
         @installers[prio] << installer_class
+
+        @registered ||= {}
+        @registered[installer_key] = installer_class if installer_key
       end
 
       ##
@@ -47,6 +65,15 @@ module VagrantVbguest
         end
         return nil
       end
+
+      ##
+      # Returns the registered Installer class for the given key.
+      #
+      # @param key [Symbol, String]
+      # @return [Class,nil]
+      def get(key)
+        @registered[key.to_s]
+      end
     end
 
     def initialize(vm, options = {})
@@ -143,8 +170,11 @@ module VagrantVbguest
     end
 
     def guest_installer_class
-      if @options[:installer].is_a?(Class)
-        @options[:installer]
+      case (installer = @options[:installer])
+      when Class
+        installer
+      when Symbol, String
+        Installer.get(installer)
       else
         Installer.detect(@vm, @options)
       end

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

@@ -26,4 +26,6 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Archlinux, 5)
+VagrantVbguest::Installer.register(:arch, VagrantVbguest::Installers::Archlinux, 5)
+VagrantVbguest::Installer.register(:archlinux, VagrantVbguest::Installers::Archlinux, 5)
+VagrantVbguest::Installer.register(:arch_linux, VagrantVbguest::Installers::Archlinux, 5)

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

@@ -119,4 +119,5 @@ module VagrantVbguest
   end
 end
 # Load this before the RedHat one, as we want it to be picked up first. (The higher the sooner its checked).
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::CentOS, 6)
+VagrantVbguest::Installer.register(:centos, VagrantVbguest::Installers::CentOS, 6)
+VagrantVbguest::Installer.register(:cent_os, VagrantVbguest::Installers::CentOS, 6)

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

@@ -44,4 +44,4 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Debian, 5)
+VagrantVbguest::Installer.register(:debian, VagrantVbguest::Installers::Debian, 5)

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

@@ -24,4 +24,4 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Fedora, 5)
+VagrantVbguest::Installer.register(:fedora, VagrantVbguest::Installers::Fedora, 5)

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

@@ -74,19 +74,20 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def running?(opts=nil, &block)
-        kmods = nil
+        kmods = []
         communicate.sudo('cat /proc/modules', opts) do |type, data|
           block.call(type, data) if block
-          kmods = data if type == :stdout && data
+          kmods << data if type == :stdout && data
         end
 
-        unless kmods
+        if kmods.empty?
           env.ui.warn "Could not read /proc/modules"
           return true
         end
 
         Array(installer_options[:running_kernel_modules]).all? do |mod|
-          /^#{mod}\b/i.match(kmods)
+          regexp = /^#{mod}\b/i
+          kmods.any? { |d| regexp.match(d) }
         end
       end
 
@@ -270,6 +271,7 @@ module VagrantVbguest
       def mount_iso(opts=nil, &block)
         env.ui.info(I18n.t("vagrant_vbguest.mounting_iso", :mount_point => mount_point))
         communicate.sudo("mount #{tmp_path} -o loop #{mount_point}", opts, &block)
+        @mounted = true
       end
 
       # A generic helper method for un-mounting the GuestAdditions iso file
@@ -281,8 +283,15 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def unmount_iso(opts=nil, &block)
+        unless @mounted
+          env.ui.info(I18n.t("vagrant_vbguest.skip_unmounting_iso"))
+          return
+        end
+
         env.ui.info(I18n.t("vagrant_vbguest.unmounting_iso", :mount_point => mount_point))
+        opts = (opts || {}).merge(:error_check => false)
         communicate.sudo("umount #{mount_point}", opts, &block)
+        @mounted = false
       end
 
       def cleanup(opts=nil, &block)
@@ -294,4 +303,4 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Linux, 2)
+VagrantVbguest::Installer.register(:linux, VagrantVbguest::Installers::Linux, 2)

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

@@ -33,4 +33,5 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::OpenSuse, 5)
+VagrantVbguest::Installer.register(:opensuse, VagrantVbguest::Installers::OpenSuse, 5)
+VagrantVbguest::Installer.register(:open_suse, VagrantVbguest::Installers::OpenSuse, 5)

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

@@ -22,4 +22,6 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Oracle, 6)
+VagrantVbguest::Installer.register(:oracle, VagrantVbguest::Installers::Oracle, 6)
+VagrantVbguest::Installer.register(:oraclelinux, VagrantVbguest::Installers::Oracle, 6)
+VagrantVbguest::Installer.register(:oracle_linux, VagrantVbguest::Installers::Oracle, 6)

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

@@ -5,7 +5,7 @@ module VagrantVbguest
       # fortunately they're probably both similar enough to RHEL
       # (RedHat Enterprise Linux) not to matter.
       def self.match?(vm)
-        /\A(redhat|centos|amazon|rocky)\d*\Z/ =~ self.distro(vm)
+        /\A(redhat|centos|amazon|rocky|alma)\d*\Z/ =~ self.distro(vm)
       end
 
       # Install missing deps and yield up to regular linux installation
@@ -49,4 +49,5 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::RedHat, 5)
+VagrantVbguest::Installer.register(:redhat, VagrantVbguest::Installers::RedHat, 5)
+VagrantVbguest::Installer.register(:red_hat, VagrantVbguest::Installers::RedHat, 5)

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

@@ -42,4 +42,4 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Suse, 6)
+VagrantVbguest::Installer.register(:suse, VagrantVbguest::Installers::Suse, 6)

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

@@ -46,4 +46,4 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Ubuntu, 5)
+VagrantVbguest::Installer.register(:ubuntu, VagrantVbguest::Installers::Ubuntu, 5)

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

@@ -104,12 +104,16 @@ module VagrantVbguest
       def mount_iso(opts = nil, &block)
         communicate.execute("Mount-DiskImage -ImagePath #{tmp_path}", opts, &block)
         env.ui.info(I18n.t("vagrant_vbguest.mounting_iso", mount_point: mount_point))
+        @mounted = true
       end
 
       def unmount_iso(opts = nil, &block)
+        return unless @mounted
         env.ui.info(I18n.t("vagrant_vbguest.unmounting_iso",mount_point: mount_point))
+        opts = (opts || {}).merge(:error_check => false)
         communicate.execute("Dismount-DiskImage -ImagePath #{tmp_path}", opts, &block)
         communicate.execute("Remove-Item -Path #{tmp_path}", opts, &block)
+        @mounted = false
       end
 
       def cleanup(opts = nil, &block)
@@ -128,4 +132,4 @@ module VagrantVbguest
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Windows, 2)
+VagrantVbguest::Installer.register(:windows, VagrantVbguest::Installers::Windows, 2)

data/locales/en.yml

@@ -4,6 +4,7 @@ en:
     skipped_rebuild: "Rebuilding GuestAdditions skipped."
     mounting_iso: "Mounting Virtualbox Guest Additions ISO to: %{mount_point}"
     unmounting_iso: "Unmounting Virtualbox Guest Additions ISO from: %{mount_point}"
+    skip_unmounting_iso: "Skipping unmount of Virtualbox Guest Additions ISO, because it was not mounted."
     installing: "Installing Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
     installing_forced: "Forcing installation of Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
     rebuild: "Rebuilding Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Robert Schulze
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM