Merge pull request #622 from yast/nvram_fixes

Nvram fixes
yast · Oct 22, 2020 · 352c28b · 352c28b
2 parents dd627d8 + 4bc515a
commit 352c28b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 22 12:53:21 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- "write proper value for NVRAM for UEFI (bsc#1157550)"
+- fix failing test on s390 (bsc#1177986)
+- 4.3.13
+
 -------------------------------------------------------------------
 Thu Oct  8 18:05:29 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.3.12
+Version:        4.3.13
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later

diff --git a/src/lib/bootloader/grub2efi.rb b/src/lib/bootloader/grub2efi.rb
@@ -110,7 +110,8 @@ def packages
     # overwrite BootloaderBase version to save secure boot
     def write_sysconfig(prewrite: false)
       sysconfig = Bootloader::Sysconfig.new(bootloader: name,
-        secure_boot: secure_boot, trusted_boot: trusted_boot, update_nvram: true)
+        secure_boot: secure_boot, trusted_boot: trusted_boot,
+        update_nvram: update_nvram)
       prewrite ? sysconfig.pre_write : sysconfig.write
     end
 

diff --git a/test/grub2base_test.rb b/test/grub2base_test.rb
@@ -357,7 +357,7 @@
 
     context "xen hypervisor kernel parameters proposal" do
       before do
-        allow(Yast::Kernel).to receive(:GetCmdLine).and_return(kernel_params)
+        allow(Yast::BootArch).to receive(:DefaultKernelParams).and_return(kernel_params)
       end
 
       context "with a serial console" do