Merge a6b0753 into f722667

CHANGELOG

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 30 07:45:45 UTC 2017 - jreidinger@suse.com
+
+- avoid crash if config file uses trailing comment (bsc#1068578)
+- 0.6.4
+
 -------------------------------------------------------------------
 Wed Aug  2 08:47:20 UTC 2017 - jreidinger@suse.com
 

cfa_grub2.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cfa_grub2"
-  s.version     = "0.6.3"
+  s.version     = "0.6.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Josef Reidinger"]
   s.email       = ["jreidinger@suse.cz"]

lib/cfa/grub2/default.rb

@@ -49,7 +49,7 @@ def load
         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 @@ def os_prober
 
       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 @@ def cryptodisk
       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 @@ def serial_console=(value)
       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.

spec/grub2_default_spec.rb

@@ -75,7 +75,8 @@
 
   describe "#kernel_params" do
     let(:file_content) do
-      "GRUB_CMDLINE_LINUX_DEFAULT=\"quite console=S0 console=S1 vga=0x400\"\n"
+      "GRUB_CMDLINE_LINUX_DEFAULT=\"quite console=S0 console=S1 vga=0x400\"" \
+        "# comment 1\n"
     end
 
     it "returns KernelParams object" do