cfa_grub2 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd1c3360b6cc4a6ddee9e466df84dd939419225
-  data.tar.gz: bacfa69a00b15fc4a24ddcc3f32a2fbd83169cd4
+  metadata.gz: 1da92fc0c60471bb86fa2fd4a2f34fdabfc5f00f
+  data.tar.gz: 40dca436f09e1af024629f4fff80610e2c087015
 SHA512:
-  metadata.gz: da3abad04fc23659e5c3884754817ad32e7653854634f461472e571437b994d3d4246f8fdf4ee769755a284ab212c9d1c82cb6bafef99fb25b4e907a341a4675
-  data.tar.gz: abe48fc3bf07252f823f8b67b6db18cb5f3e713ae0766808cf678e6b8f60071a0be9fd8e3841fad29660d4912d90de00b6ab6c9f56e7e910c6fa605858d363ff
+  metadata.gz: ce4ab7c565ab5f29cf685345fa6b3b01d027081ae208d3e7f919ec68c9c42fa1e348c30f7319bda4961d6417807bc29acd5e1d494ed52cf7d3afc56dbb48b947
+  data.tar.gz: bfa469d565c5acf02fd2d0ba1ef4efa3fc0e07d81b72c7b48120241df15c2e2b7cef08ebbd52f81d6b782b1d2b039ec669a7e367c39b61fbb18d31d7830aad01

data/lib/cfa/grub2/default.rb

@@ -49,7 +49,7 @@ module CFA
         kernels = [kernel_params, xen_hypervisor_params, xen_kernel_params,
                    recovery_params]
         kernels.each do |kernel|
-          param_line = data[kernel.key]
+          param_line = value_for(kernel.key)
           kernel.replace(param_line) if param_line
         end
       end
@@ -64,27 +64,28 @@ module CFA
 
       def kernel_params
         @kernel_params ||= KernelParams.new(
-          data["GRUB_CMDLINE_LINUX_DEFAULT"], "GRUB_CMDLINE_LINUX_DEFAULT"
+          value_for("GRUB_CMDLINE_LINUX_DEFAULT"), "GRUB_CMDLINE_LINUX_DEFAULT"
         )
       end
 
       def xen_hypervisor_params
         @xen_hypervisor_params ||= KernelParams.new(
-          data["GRUB_CMDLINE_XEN_DEFAULT"],
+          value_for("GRUB_CMDLINE_XEN_DEFAULT"),
           "GRUB_CMDLINE_XEN_DEFAULT"
         )
       end
 
       def xen_kernel_params
         @xen_kernel_params ||= KernelParams.new(
-          data["GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"],
+          value_for("GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"),
           "GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"
         )
       end
 
       def recovery_params
         @recovery_params ||= KernelParams.new(
-          data["GRUB_CMDLINE_LINUX_RECOVERY"], "GRUB_CMDLINE_LINUX_RECOVERY"
+          value_for("GRUB_CMDLINE_LINUX_RECOVERY"),
+          "GRUB_CMDLINE_LINUX_RECOVERY"
         )
       end
 
@@ -102,13 +103,14 @@ module CFA
       end
 
       def terminal
-        case data["GRUB_TERMINAL"]
+        value = value_for("GRUB_ENABLE_CRYPTODISK")
+        case value
         when "", nil   then nil
         when "console" then :console
         when "serial"  then :serial
         when "gfxterm" then :gfxterm
         else
-          raise "unknown GRUB_TERMINAL option #{data["GRUB_TERMINAL"].inspect}"
+          raise "unknown GRUB_TERMINAL option #{value.inspect}"
         end
       end
 
@@ -127,7 +129,13 @@ module CFA
       end
 
       def serial_console
-        data["GRUB_SERIAL_COMMAND"]
+        value_for("GRUB_SERIAL_COMMAND")
+      end
+
+    private
+
+      def value_for(key)
+        data[key].respond_to?(:value) ? data[key].value : data[key]
       end
 
       # Represents kernel append line with helpers to easier modification.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfa_grub2
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfa
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Models for GRUB2 configuration files.