vagrant-vbguest 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc57b2bf840ee96da32c6d2c1e76068f7e7b621009b5cb18ae11f961cfab640a
-  data.tar.gz: 5cbbec9f20453b9bb42a03895d7a6f53cebecbca7879fe18e2389aae98849420
+  metadata.gz: 5b06593adf78b594ec9a8cd373156ce66b65c2c9636d5ce18b491031b1f42cea
+  data.tar.gz: 801da70b4ae593718792ea976f43f7cc3a5feaa16d342680a33d1cf9f3fe406d
 SHA512:
-  metadata.gz: 63162302dfa737249d5e27ebca8702b044c5ed941020349d3f08825896c30b0e44705135c2074f83b7db46d56da4bad815e508f02d3e51b96262772db1361690
-  data.tar.gz: 34d4263fab308a00acc2df865a924d8a913a4322b7789ba82687be691ed6614fd188189b477dc1e28c232940d2a3d19cb6787e02a117a62ae70cf4305cc6a107
+  metadata.gz: ccebf9ed8b4ded67948a85d08fdf69021c46b9aff7dbd12d025a1516f4858f06b2102537efd484e715c5893e38d5fb4242cb123496abdd6ea7d2bb1b3ee8e81f
+  data.tar.gz: c872bcdb579253435983228ceb7cefe68aa7af4988a99d451b5ead39939e03061c2b6358b0b0919d23973ab4ef412e3aca868f8fd5e38ba320d0ca4c16e6f2e5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.29.0 (2021-01-03)
+
+- Add installer_option :enablerepo for CentOS. [GH-402], Fixes [GH-398]
+- Add installer_option :running_kernel_modules for all Linux installers. [GH-403], Fixes [GH-396]
+
 ## 0.28.0 (2020-11-20)
 
 - Work around a bug in vagrant 2.2.11 to 2.2.13, which would not load the vbguest middleware. [GH-394], Fixes [GH-391]

data/Readme.md

@@ -98,12 +98,21 @@ Vagrant.configure("2") do |config|
   end
 end
 ```
+##### Linux
 
+This option is available on all Linux type installers.
+
+* `:running_kernel_modules` (default: `["vboxguest", "vboxsf"]`) The list used to check for the "running" state. Each of these modules need to appear at the beginning of a line in `/proc/modules`.
 
 ##### 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.
+* `: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`
 
 #### Global Configuration
 

data/VERSION

@@ -1 +1 @@
-0.28.0
+0.29.0

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

@@ -29,6 +29,26 @@ module VagrantVbguest
         installer_options[:allow_kernel_upgrade]
       end
 
+      # parse the installer_option :enablerepo
+      def enablerepo
+        unless instance_variable_defined?(:@enablerepo)
+          enablerepo = installer_options.fetch(:enablerepo, false)
+          @enablerepo =
+            case enablerepo
+            when String
+              "--enablerepo=#{enablerepo}"
+            when Array
+              enablerepo.map { |e| "--enablerepo=#{e}" }.join(" ")
+            when true
+              rel = has_rel_repo? ? release_version : '*'
+              "--enablerepo=C#{rel}-base --enablerepo=C#{rel}-updates"
+            else
+              nil
+            end
+        end
+        @enablerepo
+      end
+
       def install_kernel_deps(opts=nil, &block)
         unless has_kernel_devel_info?
           update_release_repos(opts, &block)
@@ -46,7 +66,7 @@ module VagrantVbguest
       def has_rel_repo?
         unless instance_variable_defined?(:@has_rel_repo)
           rel = release_version
-          @has_rel_repo = communicate.test('yum repolist')
+          @has_rel_repo = communicate.test("yum repolist --enablerepo=C#{rel}-base --enablerepo=C#{rel}-updates")
         end
         @has_rel_repo
       end
@@ -68,8 +88,7 @@ module VagrantVbguest
       end
 
       def install_kernel_devel(opts=nil, &block)
-        rel = has_rel_repo? ? release_version : '*'
-        cmd = 'yum install -y kernel-devel-`uname -r`'
+        cmd = "yum install -y kernel-devel-`uname -r` #{enablerepo}"
         communicate.sudo(cmd, opts, &block)
       end
 

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

@@ -74,10 +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)
-        opts = {
-          :sudo => true
-        }.merge(opts || {})
-        communicate.test('grep -qE "^vboxguest\b.*vboxsf\b" /proc/modules', opts, &block)
+        kmods = nil
+        communicate.sudo('cat /proc/modules', opts) do |type, data|
+          block.call(type, data) if block
+          kmods = data if type == :stdout && data
+        end
+
+        unless kmods
+          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)
+        end
       end
 
       # This overrides {VagrantVbguest::Installers::Base#guest_version}
@@ -232,6 +242,12 @@ module VagrantVbguest
         @installer_arguments ||= Array(options[:installer_arguments]).join " "
       end
 
+      def installer_options
+        @installer_options ||= {
+          running_kernel_modules: ["vboxguest", "vboxsf"]
+        }.merge!(super)
+      end
+
       # Determine if yes needs to be called or not
       def yes
         value = @options[:yes]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Robert Schulze
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine