vagrant-vbguest 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f213012e6f9e581787544f8a4b05dac855cc79a055c3d04fb488682ce4a97a17
-  data.tar.gz: cc84ba488d581b7078b5e244239ae75d912dcde94837ff7c5d3b4138c833544f
+  metadata.gz: fd46d6d0e7bfff66a287572bbe41c9c20375a03b14c0a70122670935bd87c1b4
+  data.tar.gz: 67f4ad8b493ac4a16d45df782e7ab4785e9092444911a3a78f356a8a87ec47cd
 SHA512:
-  metadata.gz: 73d8c5ed68a32b7561d6dde9052b2a2adc22e4ef924e680eb64ee56e50c5d60207646710e7f0408f53092454f8bad90eb563cafb05b04b12b280959fe06f0ecc
-  data.tar.gz: 1389e1c8951c6fcc4b5447a806f0fd5ce0a5c2b335f8018ae5f2028ac46a2fcfde340a72678d9c9b1aa0034cde59ce13273bba6df3d0801b02eb5eeb9087e17b
+  metadata.gz: 1e41145e1eacf6aaad2d4bf17e506b408ef2be2d1f1cb3ed66b5c4a77654e69bebf5f1d99204b81c80b2b15ca5fd4c9372dbd8b6e62c3fc0482582bc89cc3d19
+  data.tar.gz: c1e19268ec2cab24a19ff5479dcfae3c4088673db2cb620d8b1c68a0db6f55cf95be170d6add8192db7c631b51eb795d9cb379c898f668ba107257dfce22d7f5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.22.0 (2019-12-01)
+
+- Opensuse installer now uninstalls packaged guest additions
+- Fix error trying to rebuild/start guest additions when no `vboxadd` to is present [GH-358]
+- Fiy Oracle installer to support non UEK kernel. [GH-357]
+
 ## 0.21.0 (2019-11-11)
 
 - Default `web_path` to virtualbox now uses https. @adamzerella [GH-354]

data/Gemfile

@@ -6,6 +6,8 @@ group :development do
   # 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"]
   else
     gem "vagrant", :git => "https://github.com/hashicorp/vagrant.git"
   end

data/VERSION

@@ -1 +1 @@
-0.21.0
+0.22.0

data/lib/vagrant-vbguest/installer.rb

@@ -105,7 +105,14 @@ module VagrantVbguest
 
     def reboot_after_install?
       if (installer = guest_installer)
-        guest_installer.reboot_after_install?
+        installer.reboot_after_install?
+      end
+    end
+
+    # Does the guest installer provide service tooling to manually start or rebuild guest additions?
+    def has_service_tools?
+      if (installer = guest_installer)
+        installer.has_vboxadd_tools?
       end
     end
 

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

@@ -129,6 +129,11 @@ module VagrantVbguest
         false
       end
 
+      # Does the guest installer provide tooling to manually start or rebuild guest additions?
+      def has_vboxadd_tools?(opts=nil, &block)
+        false
+      end
+
       # Determinates the GuestAdditions version installed on the
       # guest system.
       #

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

@@ -64,7 +64,7 @@ module VagrantVbguest
           super
         else
           # we should have installed kernel-devel-`uname -r` via install_kernel_devel
-          ['gcc', 'binutils', 'make', 'perl', 'bzip2'].join(' ')
+          ['gcc', 'binutils', 'make', 'perl', 'bzip2', 'elfutils-libelf-devel'].join(' ')
         end
       end
     end

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

@@ -135,6 +135,10 @@ module VagrantVbguest
         end
       end
 
+      def has_service_tools?(opts=nil, &block)
+        !!find_tool('vboxadd') || communicate.test('systemctl list-units --type service | grep -q vboxadd', {:sudo => true})
+      end
+
       # Check for the presence of 'systemd' chkconfg or service command.
       #
       #    systemd_tool # => {:path=>"/usr/sbin/service", :up=>"start"}

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

@@ -9,6 +9,7 @@ module VagrantVbguest
 
       # Install missing deps and yield up to regular linux installation
       def install(opts=nil, &block)
+        communicate.sudo(uninstall_dist_install_cmd, (opts || {}).merge(:error_check => false), &block)
         communicate.sudo(install_dependencies_cmd, opts, &block)
         super
       end
@@ -18,6 +19,10 @@ module VagrantVbguest
         communicate_to(vm).test("which zypper")
       end
 
+      def uninstall_dist_install_cmd
+        "zypper --non-interactive rm -y virtualbox-guest-kmp-default virtualbox-guest-tools virtualbox-guest-x11"
+      end
+
       def install_dependencies_cmd
         "zypper --non-interactive install -t pattern #{dependencies}"
       end

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

@@ -10,7 +10,13 @@ module VagrantVbguest
       protected
 
       def dependencies
-        ['kernel-uek-devel-`uname -r`', 'gcc', 'make', 'perl', 'bzip2'].join(' ')
+        [
+          'kernel-`uname -a | grep -q "uek." && echo "uek-"`devel-`uname -r`',
+          'gcc',
+          'make',
+          'perl',
+          'bzip2'
+        ].join(' ')
       end
     end
   end

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

@@ -27,7 +27,8 @@ module VagrantVbguest
           'binutils',
           'make',
           'perl',
-          'bzip2'
+          'bzip2',
+          'elfutils-libelf-devel'
         ].join(' ')
       end
     end

data/lib/vagrant-vbguest/machine.rb

@@ -54,7 +54,7 @@ module VagrantVbguest
 
     def steps(state)
       case state
-      when :clean, :unmatched
+      when :clean, :dirty, :unmatched
         [:install].tap { |l| l << :reboot if installer.reboot_after_install? }
       when :not_running
         installation_ran? ? [:reboot] : [:start, :rebuild, :reboot]
@@ -71,6 +71,9 @@ module VagrantVbguest
 
       return :clean if !guest_version
 
+      # some sort of distro installation bot no `vboxadd` tools to trgger rebuilds or manual starts
+      return :dirty if !installer.has_service_tools?
+
       if host_version != guest_version
         return :unmatched if host_version > guest_version || options[:allow_downgrade] || options[:force]
         return :not_running if !running # still need to check this here, so we don't miss it before running into "skipped_downgrade"

data/locales/en.yml

@@ -28,6 +28,7 @@ en:
 
     status:
       clean: "[%{vm_name}] No Virtualbox Guest Additions installation found."
+      dirty: "[%{vm_name}] A Virtualbox Guest Additions installation was found but no tools to rebuild or start them."
       unmatched: "[%{vm_name}] GuestAdditions versions on your host (%{host_version}) and guest (%{guest_version}) do not match."
       not_running: "[%{vm_name}] GuestAdditions seems to be installed (%{guest_version}) correctly, but not running."
       ok: "[%{vm_name}] GuestAdditions %{guest_version} running --- OK."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine