smart_proxy_discovery_image 1.3.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249769da7939f13c7cf220e3b347613d5999a4f06ee68f81d0c930ed1494ce59
-  data.tar.gz: b746dcd6207df3f11c666d55dd215a1d14da5d8ae6b7bf710ad65f6438a971a9
+  metadata.gz: 9f47a18d14a308a59b433e5831ecff7dc1dbf8160fa17dc50686c020b2eb21a5
+  data.tar.gz: 5ec638b594edf18045fc816abbcc7ea35cd8ea8605db66dd3b66cca7357dbd23
 SHA512:
-  metadata.gz: 6a85568d2bb0b3ef030f413c197a7d3c04f6c168e15890c968250fc04b79a47024e2e8c3ff4c4b4f213f0b2684313301bd580eeb1b53d9ac9fa03f506ab2642e
-  data.tar.gz: 8d0e231d24fc81b5df213585b67c5ded6b64ee4f9af3cbd1e72b4fdf65ffc15c8f6375414ab83ca14fcf081aacda4b4d00f11cf35b54abca3ce1640aabfdd8fc
+  metadata.gz: b2097ea10be509e9ddd6bc13c4839e5e9baabd35dce45b2cfbe6b7345bd8010e6c09d19e8da1a4a1439019be60fb2034a54646f0f2415fa8966e0a27b29a71a3
+  data.tar.gz: d5ff12c3d216ffc39ed1acb1df9aef6c7ad5daa72f5eb04da396771c25e2cfe9183eac567c6fc51eb902af28541227cbd32dc135761a37c6e02df25cf7f4e125

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
@@ -26,9 +27,13 @@ module Proxy::DiscoveryImage
       rescue JSON::ParserError
         log_halt 500, "Unable to parse kexec JSON input: #{body_data}"
       end
-      args = ["--debug", "--force", "--reset-vga"]
-      args << data['extra'] if data['extra']
-      args << "--kexec-file-syscall" if is_secureboot
+      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 << "--append=#{data['append']}"
       args << "--initrd=/tmp/initrd.img"
       download_and_run_after_response data, 2, kexec, *args, "/tmp/vmlinuz"

data/lib/smart_proxy_discovery_image/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module DiscoveryImage
-    VERSION = '1.3.0'
+    VERSION = '1.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery_image
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Lukas Zapletal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2022-01-17 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: []