Fixed grub2 error messages and proposals.

package/yast2-storage-ng.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jul 28 10:59:39 UTC 2025 - Stefan Schubert <schubi@suse.de>
+
+- Do not generate grub2 error messages and proposals if a BLS
+  bootlaoder (systemd-boot/grub2-bls) bootloader is the preferred
+  bootloader.
+- Do not generate subvolumes like @/boot/grub2/x86_64-efi and
+  @/boot/grub2/i386-pc if a BLS bootloader is suggested.
+- Do not generate /boot if a BLS bootloader is suggested.
+- (bsc#1244755)
+- 5.0.35
+
 -------------------------------------------------------------------
 Thu Jul 24 10:59:19 UTC 2025 - Ancor Gonzalez Sosa <ancor@suse.com>
 

package/yast2-storage-ng.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-storage-ng
-Version:        5.0.34
+Version:        5.0.35
 Release:        0
 Summary:        YaST2 - Storage Configuration
 License:        GPL-2.0-only OR GPL-3.0-only

src/lib/y2storage/boot_requirements_checker.rb

@@ -19,6 +19,7 @@
 
 require "yast"
 require "y2storage/boot_requirements_strategies"
+require "y2storage/boot_requirements_strategies/bls"
 require "y2storage/storage_manager"
 require "y2storage/storage_env"
 
@@ -140,12 +141,10 @@ def strategy_class
     # @return [BootRequirementsStrategies::Base]
     def arch_strategy_class
       if arch.efiboot?
-        if StorageEnv.instance.no_bls_bootloader ||
-            (!arch.x86? && !Yast::Arch.aarch64)
-          BootRequirementsStrategies::UEFI
-        else
-          # BLS is for x86_64 and aarch64 only
+        if Y2Storage::BootRequirementsStrategies::Analyzer.bls_bootloader_proposed?
           BootRequirementsStrategies::BLS
+        else
+          BootRequirementsStrategies::UEFI
         end
       elsif arch.s390?
         BootRequirementsStrategies::ZIPL

src/lib/y2storage/boot_requirements_strategies/analyzer.rb

@@ -22,6 +22,9 @@
 require "y2storage/planned"
 require "y2storage/encryption_type"
 
+Yast.import "ProductFeatures"
+Yast.import "Arch"
+
 module Y2Storage
   module BootRequirementsStrategies
     # Auxiliary class that takes information from several sources (current
@@ -374,6 +377,15 @@ def encrypted_zipl?
         encrypted?(device_for_zipl)
       end
 
+      def self.bls_bootloader_proposed?
+        preferred_bootloader = Yast::ProductFeatures.GetStringFeature("globals",
+          "preferred_bootloader")
+        Y2Storage::Arch.new.efiboot? &&
+          (Yast::Arch.x86_64 || Yast::Arch.aarch64) &&
+          !StorageEnv.instance.no_bls_bootloader &&
+          ["systemd-boot", "grub2-bls"].include?(preferred_bootloader)
+      end
+
       protected
 
       attr_reader :devicegraph

src/lib/y2storage/boot_requirements_strategies/base.rb

@@ -23,6 +23,7 @@
 require "y2storage/filesystems/type"
 require "y2storage/planned"
 require "y2storage/boot_requirements_strategies/analyzer"
+require "y2storage/boot_requirements_strategies/bls"
 require "y2storage/exceptions"
 require "y2storage/volume_specification"
 require "y2storage/setup_error"
@@ -84,7 +85,7 @@ def needed_partitions(target)
       def warnings
         res = []
 
-        if !boot_readable_by_grub?
+        if grub_warning? && !boot_readable_by_grub?
           error_message =
             _(
               "The grub boot loader cannot access the file system mounted at /boot. " \
@@ -109,6 +110,13 @@ def warnings
         res
       end
 
+      # Checks if it makes sense to show grub warnings
+      #
+      # @return [Boolean]
+      def grub_warning?
+        true
+      end
+
       # All fatal boot errors detected in the setup, for example, when a / partition
       # is missing
       #

src/lib/y2storage/boot_requirements_strategies/bls.rb

@@ -28,6 +28,20 @@ def initialize(*args)
         super
       end
 
+      # No extra /boot partition which is needed by grub2 only
+      def needed_partitions(target)
+        planned_partitions = []
+        planned_partitions << efi_partition(target) if efi_missing?
+        planned_partitions
+      end
+
+      # Checks if it makes sense to show grub warnings
+      #
+      # @return [Boolean]
+      def grub_warning?
+        false
+      end
+
       protected
 
       # @return [VolumeSpecification]

src/lib/y2storage/setup_checker.rb

@@ -24,6 +24,7 @@
 require "y2storage/boot_requirements_checker"
 require "y2storage/proposal_settings"
 require "y2storage/with_security_policies"
+require "y2storage/storage_manager"
 
 # This 'import' is necessary to load the control file (/etc/YaST/control.xml)
 # when running in an installed system. During installation, this module
@@ -78,7 +79,31 @@ def errors
     #
     # @return [Array<SetupError>]
     def warnings
-      boot_warnings + product_warnings + mount_warnings + security_policy_warnings
+      boot_warnings + product_warnings + mount_warnings + security_policy_warnings + encryption_warnings
+    end
+
+    # All encryption warnings detected in the setup
+    #
+    # Argion2* needs at least 4GiB of memory. Otherwise cryptsetup could crash (bsc#1246876).
+    #
+    # @return [Array<SetupError>]
+    def encryption_warnings
+      return [] if DiskSize.new(StorageManager.instance.arch.ram_size) >= DiskSize.GiB(4)
+
+      unless @encryption_warnings
+        @encryption_warnings = []
+        @devicegraph.encryptions
+          .select(&:supports_pbkdf?)
+          .each do |e|
+          next unless ["argon2id", "argon2i"].include?(e.pbkdf.value)
+
+          @encryption_warnings << SetupError.new(
+            message: format(_("Using %s for %s but this needs 4 GiB RAM at least."),
+              e.pbkdf.name, e.blk_device.name)
+          )
+        end
+      end
+      @encryption_warnings
     end
 
     # All boot errors detected in the setup

src/lib/y2storage/setup_errors_presenter.rb

@@ -60,14 +60,25 @@ def warnings_html
         boot_warnings_html,
         product_warnings_html,
         mount_warnings_html,
-        security_policy_warnings_html
+        security_policy_warnings_html,
+        encryption_warnings_html
       ].compact
 
       return nil if warnings.empty?
 
       warnings.join(Yast::HTML.Newline)
     end
 
+    # HTML representation for encryption warnings
+    #
+    # @return [String, nil] nil if there is no encryption warning
+    def encryption_warnings_html
+      warnings = setup_checker.encryption_warnings
+      header = _("There could be problems while encrypting devices:\n")
+
+      create_html(header, warnings)
+    end
+
     # HTML representation for boot warnings
     #
     # @return [String, nil] nil if there is no boot warning

src/lib/y2storage/subvol_specification.rb

@@ -64,8 +64,8 @@ class SubvolSpecification
       "var/lib/pgsql"
     ]
 
-    # Subvolumes, from the lists above, that contain architecture modifiers
-    SUBVOL_ARCHS = {
+    # Grub2 subvolumes, from the lists above, that contain architecture modifiers
+    SUBVOL_GRUB2_ARCHS = {
       "boot/grub2/i386-pc"          => ["i386", "x86_64"],
       "boot/grub2/x86_64-efi"       => ["x86_64"],
       "boot/grub2/powerpc-ieee1275" => ["ppc", "!board_powernv"],
@@ -244,7 +244,8 @@ def self.fallback_list
       subvols.concat(
         NO_COW_SUBVOL_PATHS.map { |path| SubvolSpecification.new(path, copy_on_write: false) }
       )
-      subvols.each { |subvol| subvol.archs = SUBVOL_ARCHS[subvol.path] }
+
+      subvols.each { |subvol| subvol.archs = SUBVOL_GRUB2_ARCHS[subvol.path] }
       subvols.sort!
     end
 

src/lib/y2storage/volume_specification.rb

@@ -21,6 +21,7 @@
 require "y2storage/partitioning_features"
 require "y2storage/subvol_specification"
 require "y2storage/equal_by_instance_variables"
+require "y2storage/boot_requirements_strategies/bls"
 
 Yast.import "Kernel"
 
@@ -29,6 +30,7 @@ module Y2Storage
   class VolumeSpecification
     include PartitioningFeatures
     include EqualByInstanceVariables
+    include Yast::Logger
 
     # @return [PartitionId] when the volume needs to be a partition with a specific id
     attr_accessor :partition_id
@@ -408,6 +410,24 @@ def load_features(volume_features)
     # the architecture does not support to resume from swap (i.e., for s390).
     def adjust_features
       self.adjust_by_ram = false if swap? && !resume_supported?
+
+      return unless Y2Storage::BootRequirementsStrategies::Analyzer.bls_bootloader_proposed?
+
+      # Removing grub2/grub2-efi specific subvolumes because they are not needed.
+      # Currently, the subvolumes needed for booting are directly defined in the control.xml file (or
+      # provided  by the fallback list).  But such subvolumes depend on the selected boot strategy.
+      # In the future, each strategy could provide its own list of subvolumes (similar to what
+      # happens now with the required partitions for booting). With that, control files do not have
+      # to provide the subvolumes for booting and there is no need for removing subvolumes here.
+      @subvolumes.delete_if do |subvol|
+        if SubvolSpecification::SUBVOL_GRUB2_ARCHS.key?(subvol.path)
+          log.info "Removing grub2/grub2-efi specific subvolumes #{subvol.path} " \
+                   "because a BLS bootloader is default."
+          true
+        else
+          false
+        end
+      end
     end
 
     def validated_fs_type(type)

test/support/boot_requirements_uefi.rb

@@ -134,10 +134,12 @@
   end
 end
 
-RSpec.shared_context "BLS bootloader not disabled" do
-  context "and BLS installation is not explicitly disabled" do
+RSpec.shared_context "BLS bootloader proposed" do
+  context "and BLS bootloader is proposed and possible" do
     before do
-      allow(Y2Storage::StorageEnv.instance).to receive(:no_bls_bootloader).and_return(false)
+      allow(Y2Storage::BootRequirementsStrategies::Analyzer).to receive(
+                                                                  :bls_bootloader_proposed?
+                                                                ).and_return(true)
     end
 
     include_examples "EFI partition for BLS bootloaders"

test/y2storage/boot_requirements_checker_aarch64_test.rb

@@ -52,10 +52,11 @@
       let(:efi_part) { find_vol("/boot/efi", checker.needed_partitions(target)) }
       let(:desired_efi_part) { find_vol("/boot/efi", checker.needed_partitions(:desired)) }
 
-      include_examples "BLS bootloader not disabled"
-      context "and BLS installation is explicitly disabled" do
+      context "and BLS bootloader is explicitly disabled" do
         before do
-          allow(Y2Storage::StorageEnv.instance).to receive(:no_bls_bootloader).and_return(true)
+          allow(Y2Storage::BootRequirementsStrategies::Analyzer).to receive(
+                                                                 :bls_bootloader_proposed?
+                                                               ).and_return(false)
         end
 
         include_examples "minimalistic EFI partition"

test/y2storage/boot_requirements_checker_raspi_test.rb

@@ -25,6 +25,10 @@
 
 describe Y2Storage::BootRequirementsChecker do
   describe "#needed_partitions in a Raspberry Pi" do
+    before do
+      allow_any_instance_of(Y2Storage::Arch).to receive(:efiboot?).and_return(false)
+    end
+
     using Y2Storage::Refinements::SizeCasts
 
     include_context "boot requirements"

test/y2storage/boot_requirements_checker_x86_test.rb

@@ -297,7 +297,7 @@
         let(:efi_partitions) { [] }
 
         include_examples "proposed EFI partition basics"
-        include_examples "BLS bootloader not disabled"
+        include_examples "BLS bootloader proposed"
 
         context "and BLS installation is explicitly disabled" do
           before do