mark properly configuration as read and remove not used parameters (b…

…nc#978366)

src/lib/bootloader/grub2.rb

@@ -30,9 +30,8 @@ def initialize
       @trusted_boot = false
     end
 
-    # Read settings from disk
-    # @param [Boolean] reread boolean true to force reread settings from system
-    def read(reread: false)
+    # Read settings from disk, overwritting already set values
+    def read
       super
 
       begin
@@ -54,7 +53,7 @@ def read(reread: false)
         @device_map = DeviceMap.new
       end
 
-      @trusted_boot = Sysconfig.from_system.trusted_boot if reread || @trusted_boot.nil?
+      @trusted_boot = Sysconfig.from_system.trusted_boot
     end
 
     # Write bootloader settings to disk

src/lib/bootloader/grub2base.rb

@@ -70,8 +70,10 @@ def pmbr_setup(*devices)
       end
     end
 
-    def read(reread: false)
-      grub_default.load if !grub_default.loaded? || reread
+    def read
+      super
+
+      grub_default.load
       grub_cfg = CFA::Grub2::GrubCfg.new
       begin
         grub_cfg.load

src/lib/bootloader/grub2efi.rb

@@ -21,11 +21,9 @@ def initialize
       @grub_install = GrubInstall.new(efi: true)
     end
 
-    # Read settings from disk
-    # @param [Boolean] reread boolean true to force reread settings from system
-    # internal data
-    def read(reread: false)
-      @secure_boot = Sysconfig.from_system.secure_boot if reread || @secure_boot.nil?
+    # Read settings from disk overwritting already set values
+    def read
+      @secure_boot = Sysconfig.from_system.secure_boot
 
       super
     end