grub2bls

rubocop rubocop rubocop rubocop rubocop docu added yast-bootloader added yast-bootloader
yast · Nov 13, 2024 · 8cfcb3a · 8cfcb3a
1 parent d9d0d4d
commit 8cfcb3a
Show file tree

Hide file tree

Showing 6 changed files with 472 additions and 1,057 deletions.
diff --git a/README.md b/README.md
@@ -37,6 +37,7 @@ that holds and also can propose the bootloader implementation. So now let's expl
 
 - [GRUB2](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/Grub2) for legacy booting or emulated grub2 boot like s390x.
 - [GRUB2-EFI](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/Grub2EFI) for EFI variant of GRUB2 bootloader
+- [GRUB2-BLS](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/Grub2Bls) bootloader based on Boot Loader Specification(BLS) (for EFI only)
 - [systemd-boot](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/SystemdBoot) systemd bootloader (for EFI only)
 - [None](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/NoneBootloader) when YaST does not manage booting
 - [GRUB2 base](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/Grub2Base) is the shared functionality for both GRUB2 implementations

diff --git a/doc/bootloader_backend.svg b/doc/bootloader_backend.svg
diff --git a/src/lib/bootloader/bootloader_base.rb b/src/lib/bootloader/bootloader_base.rb
@@ -11,7 +11,11 @@
 module Bootloader
   # Represents base for all kinds of bootloaders
   class BootloaderBase
+    include Yast::I18n
+
     def initialize
+      textdomain "bootloader"
+
       @read = false
       @proposed = false
       @initial_sysconfig = Sysconfig.from_system

diff --git a/test/bls_sections_test.rb b/test/bls_sections_test.rb
@@ -10,42 +10,42 @@
 
   before do
     allow(Yast::Misc).to receive(:CustomSysconfigRead)
-        .with("ID_LIKE", "openSUSE", "/etc/os-release")
-        .and_return("openSUSE")
+      .with("ID_LIKE", "openSUSE", "/etc/os-release")
+      .and_return("openSUSE")
   end
 
   describe "#read" do
     before do
-     allow(Yast::Execute).to receive(:on_target)
+      allow(Yast::Execute).to receive(:on_target)
         .with("/usr/bin/bootctl", "--json=short", "list", stdout: :capture)
         .and_return("[{\"title\" : \"openSUSE Tumbleweed\", \"isDefault\" : true }," \
                     "{\"title\" : \"Snapper: *openSUSE Tumbleweed 20241107\", \"isDefault\" : false}]")
-     allow(Yast::Misc).to receive(:CustomSysconfigRead)
+      allow(Yast::Misc).to receive(:CustomSysconfigRead)
         .with("default", "", "/boot/efi/EFI/openSUSE/grubenv")
         .and_return("openSUSE Tumbleweed")
-     subject.read     
+      subject.read
     end
 
     it "returns list of all available sections" do
       expect(subject.all).to eq(["openSUSE Tumbleweed", "Snapper: *openSUSE Tumbleweed 20241107"])
     end
 
     it "reads default menu entry" do
-      expect(subject.default).to eq("openSUSE Tumbleweed")      
+      expect(subject.default).to eq("openSUSE Tumbleweed")
     end
   end
 
   describe "#default=" do
     before do
-     allow(Yast::Execute).to receive(:on_target)
+      allow(Yast::Execute).to receive(:on_target)
         .with("/usr/bin/bootctl", "--json=short", "list", stdout: :capture)
         .and_return("[{\"title\" : \"openSUSE Tumbleweed\", \"isDefault\" : true }," \
                     "{\"title\" : \"Snapper: *openSUSE Tumbleweed 20241107\", \"isDefault\" : false}]")
-     allow(Yast::Misc).to receive(:CustomSysconfigRead)
+      allow(Yast::Misc).to receive(:CustomSysconfigRead)
         .with("default", "", "/boot/efi/EFI/openSUSE/grubenv")
         .and_return("openSUSE Tumbleweed")
-     subject.read     
-    end    
+      subject.read
+    end
     it "sets new value for default" do
       subject.default = "Snapper: *openSUSE Tumbleweed 20241107"
       expect(subject.default).to eq "Snapper: *openSUSE Tumbleweed 20241107"
@@ -61,16 +61,16 @@
     it "writes default value if set" do
       subject.default = "Snapper: *openSUSE Tumbleweed 20241107"
       expect(Yast::Execute).to receive(:on_target)
-        .with("/usr/bin/sdbootutil", "set-default", subject.default, {:allowed_exitstatus=>[0, 1]})
+        .with("/usr/bin/sdbootutil", "set-default", subject.default, { :allowed_exitstatus=>[0, 1] })
       subject.write
     end
 
     it "does not write default value if not set" do
       subject.default = ""
       expect(Yast::Execute).to_not receive(:on_target)
-        .with("/usr/bin/sdbootutil", "set-default", subject.default, {:allowed_exitstatus=>[0, 1]})
+        .with("/usr/bin/sdbootutil", "set-default", subject.default, { :allowed_exitstatus=>[0, 1] })
       subject.write
-    end    
+    end
 
   end
 end
diff --git a/test/boot_support_test.rb b/test/boot_support_test.rb
@@ -42,6 +42,13 @@
         expect(subject.SystemSupported).to eq false
       end
 
+      it "returns false if grub2-bls is used and UEFI is not supported" do
+        Bootloader::BootloaderFactory.current_name = "grub2-bls"
+        allow(subject).to receive(:efi?).and_return(false)
+
+        expect(subject.SystemSupported).to eq false
+      end
+
       it "returns false if systemd-boot is used and UEFI is not supported" do
         Bootloader::BootloaderFactory.current_name = "systemd-boot"
         allow(subject).to receive(:efi?).and_return(false)

diff --git a/test/grub2_bls_test.rb b/test/grub2_bls_test.rb
@@ -111,6 +111,7 @@
   describe "#packages" do
     it "adds grub2* and sdbootutil packages" do
       allow(Yast::Arch).to receive(:architecture).and_return("x86_64")
+      allow(Yast::Package).to receive(:Available).with("os-prober").and_return(true)
       expect(subject.packages).to include("grub2-" + Yast::Arch.architecture + "-efi-bls")
       expect(subject.packages).to include("sdbootutil")
       expect(subject.packages).to include("grub2")