do not skip grub2 install if runned with empty devices (bnc#980250)

yast · May 17, 2016 · 0b73b3c · 0b73b3c
1 parent 5bc79cd
commit 0b73b3c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/lib/bootloader/grub_install.rb b/src/lib/bootloader/grub_install.rb
@@ -47,12 +47,14 @@ def execute(devices: nil, secure_boot: false, trusted_boot: false)
         cmd << "--no-nvram" << "--removable"
       end
 
-      if devices
+      if devices && !devices.empty?
         devices.each do |dev|
           Yast::Execute.on_target(cmd + [dev])
         end
       else
-        Yast::Execute.on_target(cmd)
+        # 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
     end
 

diff --git a/test/grub_install_test.rb b/test/grub_install_test.rb
@@ -77,7 +77,7 @@ def expect_grub2_install(target, device: nil, removable: false)
         stub_efivars
         expect_grub2_install("arm64-efi")
 
-        subject.execute
+        subject.execute(devices: [])
       end
 
       it "raise exception for other architectures" do
@@ -145,9 +145,9 @@ def expect_grub2_install(target, device: nil, removable: false)
         stub_arch("s390_64")
         stub_efivars
 
-        expect_grub2_install("s390x-emu", device: "/dev/dasda1")
+        expect_grub2_install("s390x-emu")
 
-        subject.execute(devices: ["/dev/dasda1"])
+        subject.execute(devices: [])
       end
 
       it "raise exception on aarch64" do