cfa_grub2 0.6.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c81cab27a080e614045df39129dc4967ef57fca4ad00d1cea67c49db94444c
-  data.tar.gz: e902a23407e7d72dcb4b65bc102d29a9e109e0dcfdcc44d5a53b466849f8b6cd
+  metadata.gz: ff7e5c144a004feaf68e19d24524e2617f26cf04e9847c771050235df78ab709
+  data.tar.gz: 6dc262064802eacc2575c8fdee34215f9d11fba0a4dea51f8b3be50547813322
 SHA512:
-  metadata.gz: 698aff51bb9b6a16837186d3343e997aaaf07d7e68d5255708b8d486bb48e532218dd2afe8254e7dfc06324030691cbe700ca81cfb630f7cdecd875a4748373b
-  data.tar.gz: dce8977041bcfe8ae4e4cf38ec7b3f717a009f3363102394175fb690c1a4c4c38f10e44fedb35d0644605bb92fa96ddd8ae7a626123aff3e279ece67ffbfc1d9
+  metadata.gz: 272204cfab3bf96d723c58dab6ced4eff219909253b765b06ae2f724b3b4e9726cdba6c0a8bf9469bd0dc44395eec4c41357318a9ed775b3f5b0dc027ddd62fd
+  data.tar.gz: bc02ec452fd622b02d77049dca3d78d5190d6b42809311f1bd6460d20fa0ca2da368431b3337e990b2b17d93cf38a5f4a24727fbaaa572c73f7b5eab6eb7c988

data/lib/cfa/grub2/default.rb

@@ -31,7 +31,7 @@ module CFA
           file_handler: file_handler)
       end
 
-      def save
+      def save(changes_only: false)
         # serialize kernel params object before save
         kernels = [@kernel_params, @xen_hypervisor_params, @xen_kernel_params,
                    @recovery_params]
@@ -90,7 +90,7 @@ module CFA
       end
 
       def recovery_entry
-        @recovery ||= BooleanValue.new(
+        @recovery_entry ||= BooleanValue.new(
           "GRUB_DISABLE_RECOVERY", self,
           # grub key is disable, so use reverse logic
           true_value: "false", false_value: "true"
@@ -102,25 +102,41 @@ module CFA
           true_value: "y", false_value: "n")
       end
 
+      VALID_TERMINAL_OPTIONS = [:serial, :console, :gfxterm].freeze
+      # Reads value of GRUB_TERMINAL from /etc/default/grub
+      #
+      # GRUB_TERMINAL option allows multiple values as space separated string
+      #
+      # @return [Array<Symbol>, nil] an array of symbols where each symbol
+      #                              represents supported terminal definition
+      #                              nil if value is undefined or empty
       def terminal
-        value = value_for("GRUB_TERMINAL")
-        case value
-        when "", nil   then nil
-        when "console" then :console
-        when "serial"  then :serial
-        when "gfxterm" then :gfxterm
-        else
-          raise "unknown GRUB_TERMINAL option #{value.inspect}"
+        values = value_for("GRUB_TERMINAL")
+
+        return nil if values.nil? || values.empty?
+
+        values.split.map do |value|
+          msg = "unknown GRUB_TERMINAL option #{value.inspect}"
+          raise msg if !VALID_TERMINAL_OPTIONS.include?(value.to_sym)
+
+          value.to_sym
         end
       end
 
-      VALID_TERMINAL_OPTIONS = [:serial, :console, :gfxterm].freeze
-      def terminal=(value)
-        if !VALID_TERMINAL_OPTIONS.include?(value)
-          raise ArgumentError, "invalid value #{value.inspect}"
-        end
+      # Sets GRUB_TERMINAL option
+      #
+      # Raises an ArgumentError exception in case of invalid value
+      #
+      # @param values [Array<Symbol>, nil] list of accepted terminal valuesi
+      #                                    (@see VALID_TERMINAL_OPTIONS)
+      def terminal=(values)
+        values = [] if values.nil?
+
+        msg = "A value is invalid: #{values.inspect}".freeze
+        invalid = values.any? { |v| !VALID_TERMINAL_OPTIONS.include?(v) }
+        raise ArgumentError, msg if invalid
 
-        generic_set("GRUB_TERMINAL", value.to_s)
+        generic_set("GRUB_TERMINAL", values.join(" "))
       end
 
       def serial_console=(value)

data/lib/cfa/grub2/device_map.rb

@@ -23,7 +23,7 @@ module CFA
           file_handler: file_handler)
       end
 
-      def save
+      def save(changes_only: false)
         raise "Too many grub devices. Limit is 8." if grub_devices.size > 8
 
         super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfa_grub2
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfa
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.5'
 description: Models allowing easy read and modification of GRUB2 configuration files.
   It is a plugin for cfa framework.
 email: