make rubocop happy

src/lib/bootloader/grub_install.rb

@@ -10,7 +10,7 @@ def initialize(efi: false)
       @efi = efi
     end
 
-    def execute(devices: nil, secure_boot: false, trusted_boot: false)
+    def execute(devices: [], secure_boot: false, trusted_boot: false)
       raise "cannot have secure boot without efi" if secure_boot && !@efi
       raise "cannot have trusted boot with efi" if trusted_boot && @efi
 
@@ -25,6 +25,18 @@ def execute(devices: nil, secure_boot: false, trusted_boot: false)
         cmd << "--directory=/usr/lib/trustedgrub2/#{target}" if trusted_boot
       end
 
+      cmd << "--no-nvram" << "--removable" if removable_efi?
+
+      if no_device_install?
+        Yast::Execute.on_target(cmd)
+      else
+        devices.each { |d| Yast::Execute.on_target(cmd + [d]) }
+      end
+    end
+
+  private
+
+    def removable_efi?
       # EFI has 2 boot paths. The default is that there is a target file listed
       # in the boot list. The boot list is stored in NVRAM and exposed as
       # efivars.
@@ -43,22 +55,12 @@ def execute(devices: nil, secure_boot: false, trusted_boot: false)
       # working NVRAM, we either see no efivars at all (booted via non-EFI entry
       # point) or there is no efi variable exposed. Install grub in the
       # removable location there.
-      if @efi && Dir.glob("/sys/firmware/efi/efivars/*").empty?
-        cmd << "--no-nvram" << "--removable"
-      end
-
-      if devices && !devices.empty?
-        devices.each do |dev|
-          Yast::Execute.on_target(cmd + [dev])
-        end
-      else
-        # s390 and efi can install grub2 without device, otherwise user
-        # intentionally do not want grub2 installed by yast2
-        Yast::Execute.on_target(cmd) if Yast::Arch.s390 || @efi
-      end
+      @efi && Dir.glob("/sys/firmware/efi/efivars/*").empty?
     end
 
-  private
+    def no_device_install?
+      Yast::Arch.s390 || @efi
+    end
 
     def target
       @target ||= case Yast::Arch.architecture

src/lib/bootloader/stage1.rb

@@ -171,7 +171,7 @@ def merge(other)
       log.info "stage1 to merge #{other.inspect}"
 
       if other.devices.empty?
-        self.activate    = activate?    || other.activate?
+        self.activate    = activate? || other.activate?
         self.generic_mbr = generic_mbr? || other.generic_mbr?
       else
         clear_devices

src/modules/Bootloader.rb

@@ -98,7 +98,7 @@ def Import(data)
 
       proposed_configuration = ::Bootloader::BootloaderFactory
         .bootloader_by_name(imported_configuration.name)
-      unless Mode.config  # no AutoYaST configuration mode
+      unless Mode.config # no AutoYaST configuration mode
         proposed_configuration.propose
         proposed_configuration.merge(imported_configuration)
       end