Merge sp3

package/yast2-bootloader.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 19 18:21:58 UTC 2021 - Josef Reidinger <jreidinger@suse.com>
+
+- Fix crash when bootloader is not managed by yast and security
+  module wants to show cpu mitigation (bsc#1184968)
+- 4.3.26
+
 -------------------------------------------------------------------
 Wed Mar 10 12:47:05 UTC 2021 - Josef Reidinger <jreidinger@suse.com>
 

package/yast2-bootloader.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.3.25
+Version:        4.3.26
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later

src/lib/bootloader/grub2_widgets.rb

@@ -129,7 +129,7 @@ def label
 
     def items
       ::Bootloader::CpuMitigations::ALL.map do |m|
-        [m.value, m.to_human_string]
+        [m.value.to_s, m.to_human_string]
       end
     end
 
@@ -159,11 +159,17 @@ def help
     end
 
     def init
-      self.value = grub2.cpu_mitigations.value
+      if grub2.respond_to?(:cpu_mitigations)
+        self.value = grub2.cpu_mitigations.value.to_s
+      else
+        # do not crash when use no bootloader. This widget is also used in security dialog.
+        # (bsc#1184968)
+        disable
+      end
     end
 
     def store
-      grub2.cpu_mitigations = ::Bootloader::CpuMitigations.new(value)
+      grub2.cpu_mitigations = ::Bootloader::CpuMitigations.new(value.to_sym) if enabled?
     end
   end
 

test/grub2_widgets_test.rb

@@ -102,6 +102,38 @@ def stub_widget_value(id, value)
   end
 end
 
+describe Bootloader::CpuMitigationsWidget do
+  before do
+    assign_bootloader
+  end
+
+  it_behaves_like "labeled widget"
+  it_behaves_like "CWM::ComboBox"
+
+  context "when none bootloader is selected" do
+    before do
+      assign_bootloader("none")
+    end
+
+    describe "#init" do
+      it "disables widget" do
+        expect(subject).to receive(:disable)
+
+        subject.init
+      end
+    end
+
+    describe "#store" do
+      it "does nothing on disabled widget" do
+        expect(subject).to receive(:enabled?).and_return(false)
+        expect(subject).to_not receive(:value)
+
+        subject.store
+      end
+    end
+  end
+end
+
 describe Bootloader::ActivateWidget do
   before do
     assign_bootloader