smart_proxy_discovery_image 1.2.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5fc93e913ac9a70a9d099a12e4a7eba8139777de210569b44fb8e305e74299c
-  data.tar.gz: b41a1f2e085f2f7a04a33a88a6f670581d1d89ae34b6a59a497b135f12ad76ea
+  metadata.gz: 63fcad0e9bd9c8a39569890351e410f31a18067de5047df0c8fa8417af589fe7
+  data.tar.gz: 6d543be76718df30385823f19e9b9ba6c53ded883974f7a65f9e620ca9d2e9d9
 SHA512:
-  metadata.gz: e79b8fc34a0f3e04a99fd5f380bb9aa55699fe9d9db0b61e093173e41aa98e0340a8bc99a981b799ae669b5aec8fed82283d6c00ebd5000ced63c026cf6af94d
-  data.tar.gz: 6c2a81f40a1f6285a3e928cea8340a7c3ad633bd3cca2f87c1352b76f1c4599c49f94b15b5f6b8fbd4e66349c24dc9ceeba27bbfdb17d8bd85f8aa6c98f63de3
+  metadata.gz: b8dcb2bedf37a4e212751dbd6183208b03aff8e88dca2bebbccd008e36efa03bbb79ab6daa4ef42eabe2934fdd15e49b58eeee67ccde7197b1a842373b5007d9
+  data.tar.gz: 7d2cb6faa3d9cb6f01e0bb5e6cef224dd7c14ebe2dca84a9783999622c04d78b09592d3caf5c2655cc9d378823c3a2f5a6b2fe141dff70f9493af8318a265ac7

data/lib/smart_proxy_discovery_image/power_api.rb

@@ -7,8 +7,9 @@ module Proxy::DiscoveryImage
     include Proxy::Util
 
     put "/reboot" do
-      log_halt(500, "shutdown binary was not found") unless (shutdown = which('shutdown'))
-      run_after_response 5, shutdown, "-r", "now", "Foreman Power API reboot"
+      log_halt(500, "reboot binary was not found") unless (reboot = which('reboot'))
+      # --force must be used to avoid transitioning back from systemd to initramdisk
+      run_after_response 2, reboot, "-f"
       content_type :json
       { :result => true }.to_json
     end
@@ -17,6 +18,8 @@ module Proxy::DiscoveryImage
       body_data = request.body.read
       # change virtual terminal out of newt screen
       system("chvt", "2")
+      is_secureboot = system('mokutil --sb-state|grep enabled')
+      logger.debug "Secure boot is #{is_secureboot}"
       logger.debug "Initiated kexec provisioning with #{body_data}"
       log_halt(500, "kexec binary was not found") unless (kexec = which('kexec'))
       begin
@@ -24,7 +27,18 @@ module Proxy::DiscoveryImage
       rescue JSON::ParserError
         log_halt 500, "Unable to parse kexec JSON input: #{body_data}"
       end
-      download_and_run_after_response data, 2, kexec, "--debug", "--force", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz", *data['extra']
+      args = ["--debug", "--force"]
+      extra = data['extra']
+      if extra && extra.is_a?(String)
+        args << extra
+      elsif extra && extra.is_a?(Array)
+        args.concat(extra)
+      end
+      args << "--kexec-file-syscall" if is_secureboot
+      args << "--append=#{data['append']}"
+      args << "--initrd=/tmp/initrd.img"
+      download_and_run_after_response data, 2, kexec, *args, "/tmp/vmlinuz"
+
       { :result => true }.to_json
     end
 

data/lib/smart_proxy_discovery_image/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module DiscoveryImage
-    VERSION = '1.2.1'
+    VERSION = '1.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery_image
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Lukas Zapletal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Smart Proxy plugin providing Image API on discovered nodes. This plugin is only
@@ -34,7 +34,7 @@ homepage: https://github.com/theforeman/smart_proxy_discovery_image
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -49,8 +49,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: FDI API for Foreman Smart-Proxy
 test_files: []