vagrant-vbguest-redhat-kernel-update 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da466fa5890abfd0184055d46420f3ff74c7746c
-  data.tar.gz: 3447fcd8955ddb565200f62cd02d58e06877a2bc
+  metadata.gz: d8e3897106b414bce26564d069aed2d76b3eac3c
+  data.tar.gz: 2ca364d3958cccb25b8854d6ce410ee3b708a409
 SHA512:
-  metadata.gz: 8ead4588f3e560f0b8e576fdcf6d18b68769e49043c25588a845209145726d67312cc67b9ce2ab8ade07870a65d3953051cd16cc8b3a425b627c57ba88ff95fd
-  data.tar.gz: 6e9186e1aa7235494cc4963d0d8398990056387d687ff6549ddc223d40fd023116064c4ad626a12b1cf990bc6de4f44be6e3a4132b2bcbd26a810bc35d30c340
+  metadata.gz: bbfcb754e197e01396edc8716bf05f115d0e8194ffd63aec5e8042b92bf1d30f8161b8f51835ff6fadc206ba199e42f323b460516bb769183bbc5c816e46aa79
+  data.tar.gz: 26adf7a18feb25a3e9043e6e2bfb9fe1b8cb80249184785e3790d64715c664d26db639ac65d2a45b45e7bf4108a58e602f3a944d682232643a137f0887b7e0e1

data/lib/vagrant-vbguest-redhat-kernel-update/installer.rb

@@ -20,7 +20,8 @@ module VagrantVbguestRedHatKernelUpdate
   protected
 
     def restart_additions(opts=nil, &block)
-      communicate.sudo("/etc/init.d/vboxadd restart", opts, &block)
+      # TODO appropriate restart with systemd
+      communicate.sudo("[[ -f /etc/init.d/vboxadd ]] && /etc/init.d/vboxadd restart || :", opts, &block)
     end
 
     # TODO submit MR to have this in upstream
@@ -53,9 +54,37 @@ module VagrantVbguestRedHatKernelUpdate
       @env.ui.warn("Attempting to upgrade the kernel")
       communicate.sudo("yum -y upgrade kernel{,-devel,-headers}", opts, &block)
       @env.ui.warn("Restarting to activate upgraded kernel")
-      reboot!(@vm, {:auto_reboot => true})
+
+      # should work from what I can tell, but doesn't :(
+      #vm.action(:reload, {});
+      reboot(@vm, {:auto_reboot => true})
+
+      # hide this reboot from vbguest
+      #@@rebooted[ self.class.vm_id(vm) ] = false
     end
 
+    # I have NFI why @vm.action(:reload) doesn't work!
+    # It's as though we can't hook into the action chain fully, and the result is
+    # there's a bogus check for the guest additions before the boot which causes
+    # failure
+    def reboot(vm, options)
+      simple_reboot = Vagrant::Action::Builder.new.tap do |b|
+        b.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :poweroff, :running do |env2, b2|
+          if !env2[:result]
+            b2.use VagrantPlugins::ProviderVirtualBox::Action::ForcedHalt
+          end
+        end
+        b.use VagrantPlugins::ProviderVirtualBox::Action::Boot
+        if defined?(Vagrant::Action::Builtin::WaitForCommunicator)
+          b.use Vagrant::Action::Builtin::WaitForCommunicator, [:starting, :running]
+        end
+      end
+      # this is not ideal - we're just grabbing the bits we need to allow this to work
+      @env.action_runner().run(simple_reboot, {
+        :ui => @env.ui,
+        :machine => vm,
+      })
+    end
 
   end
 end

data/lib/vagrant-vbguest-redhat-kernel-update/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguestRedHatKernelUpdate
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest-redhat-kernel-update
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Sharpe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-vbguest