Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2022-04-09 01:44:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Sat Apr 9 01:44:00 2022 rev:321 rq:967590 version:4.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2022-02-04 00:45:42.661377724 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.1900/yast2-bootloader.changes
2022-04-09 01:44:12.146626390 +0200
@@ -1,0 +2,13 @@
+Thu Apr 7 13:21:58 UTC 2022 - Josef Reidinger <[email protected]>
+
+- AutoYaST: do not clone device for hibernation and also check
+ during autoinstallation if device for hibernation exists and if
+ not then use proposed one. (bsc#1187690 and bsc#1197192)
+- 4.5.1
+
+-------------------------------------------------------------------
+Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slez??k <[email protected]>
+
+- Bump version to 4.5.0 (#bsc1198109)
+
+-------------------------------------------------------------------
@@ -73 +85,0 @@
-
Old:
----
yast2-bootloader-4.4.16.tar.bz2
New:
----
yast2-bootloader-4.5.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.uw0r9u/_old 2022-04-09 01:44:12.978616540 +0200
+++ /var/tmp/diff_new_pack.uw0r9u/_new 2022-04-09 01:44:12.978616540 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 4.4.16
+Version: 4.5.1
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
++++++ yast2-bootloader-4.4.16.tar.bz2 -> yast2-bootloader-4.5.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.4.16/package/yast2-bootloader.changes
new/yast2-bootloader-4.5.1/package/yast2-bootloader.changes
--- old/yast2-bootloader-4.4.16/package/yast2-bootloader.changes
2022-01-31 13:36:25.000000000 +0100
+++ new/yast2-bootloader-4.5.1/package/yast2-bootloader.changes 2022-04-07
20:08:05.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Thu Apr 7 13:21:58 UTC 2022 - Josef Reidinger <[email protected]>
+
+- AutoYaST: do not clone device for hibernation and also check
+ during autoinstallation if device for hibernation exists and if
+ not then use proposed one. (bsc#1187690 and bsc#1197192)
+- 4.5.1
+
+-------------------------------------------------------------------
+Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slez??k <[email protected]>
+
+- Bump version to 4.5.0 (#bsc1198109)
+
+-------------------------------------------------------------------
Fri Jan 28 22:37:00 UTC 2022 - Josef Reidinger <[email protected]>
- Allow product/system role to select boot timeout (jsc#SLE-22667)
@@ -70,7 +83,6 @@
-------------------------------------------------------------------
Wed Jul 7 09:22:03 UTC 2021 - Stefan Hundhammer <[email protected]>
-
- Add the os-prober package to the set of packages to install
if the package is available and supported on the arch
(bsc#1186369)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.4.16/package/yast2-bootloader.spec
new/yast2-bootloader-4.5.1/package/yast2-bootloader.spec
--- old/yast2-bootloader-4.4.16/package/yast2-bootloader.spec 2022-01-31
13:36:25.000000000 +0100
+++ new/yast2-bootloader-4.5.1/package/yast2-bootloader.spec 2022-04-07
20:08:05.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 4.4.16
+Version: 4.5.1
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.4.16/src/lib/bootloader/autoyast_converter.rb
new/yast2-bootloader-4.5.1/src/lib/bootloader/autoyast_converter.rb
--- old/yast2-bootloader-4.4.16/src/lib/bootloader/autoyast_converter.rb
2022-01-31 13:36:25.000000000 +0100
+++ new/yast2-bootloader-4.5.1/src/lib/bootloader/autoyast_converter.rb
2022-04-07 20:08:05.000000000 +0200
@@ -117,12 +117,7 @@
def import_default(data, default)
# import first kernel params as cpu_mitigations can later modify it
- DEFAULT_KERNEL_PARAMS_MAPPING.each do |key, method|
- val = data.global.public_send(key)
- next unless val
-
- default.public_send(method).replace(val)
- end
+ import_kernel_params(data, default)
DEFAULT_BOOLEAN_MAPPING.each do |key, method|
val = data.global.public_send(key)
@@ -148,6 +143,22 @@
import_timeout(data, default)
end
+ def import_kernel_params(data, default)
+ DEFAULT_KERNEL_PARAMS_MAPPING.each do |key, method|
+ val = data.global.public_send(key)
+ next unless val
+
+ # import resume only if device exists (bsc#1187690)
+ resume = val[/(?:\s|\A)resume=(\S+)/, 1]
+ if resume && !Yast::BootStorage.staging.find_by_any_name(resume)
+ log.warn "Remove 'resume' parameter due to usage of non existing
device '#{resume}'"
+ val = val.gsub(/(?:\s|\A)resume=#{Regexp.escape(resume)}/, "")
+ end
+
+ default.public_send(method).replace(val)
+ end
+ end
+
def import_timeout(data, default)
return unless data.global.timeout
@@ -297,7 +308,13 @@
DEFAULT_KERNEL_PARAMS_MAPPING.each do |key, method|
val = default.public_send(method)
- res[key] = val.serialize unless val.empty?
+ result = val.serialize
+ # Do not export the 'resume' parameter as it depends on storage,
which is not
+ # cloned by default. The only exception is partition label which is
cloned,
+ # but we decided to be consistent and also remove it.
+ # Anyways, 'resume' will be proposed if it's missing (bsc#1187690).
+ result.gsub!(/(?:\s|\A)resume=\S+/, "")
+ res[key] = result unless result.empty?
end
DEFAULT_STRING_MAPPING.each do |key, method|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.4.16/test/autoyast_converter_test.rb
new/yast2-bootloader-4.5.1/test/autoyast_converter_test.rb
--- old/yast2-bootloader-4.4.16/test/autoyast_converter_test.rb 2022-01-31
13:36:25.000000000 +0100
+++ new/yast2-bootloader-4.5.1/test/autoyast_converter_test.rb 2022-04-07
20:08:05.000000000 +0200
@@ -48,17 +48,19 @@
it "import configuration to returned bootloader" do
data = {
- "append" => "verbose nomodeset",
- "terminal" => "gfxterm",
- "os_prober" => "true",
- "hiddenmenu" => "true",
- "timeout" => 10,
- "activate" => "true",
- "generic_mbr" => "false",
- "trusted_grub" => "true",
- "update_nvram" => "true",
- "boot_boot" => "true",
- "password" => {
+ "append" => "verbose nomodeset
resume=/dev/disk/by-uuid/bla-bla",
+ # /dev/sda exists on mocked trivial system, so it should not be removed
+ "xen_kernel_append" => "verbose nomodeset resume=/dev/sda1",
+ "terminal" => "gfxterm",
+ "os_prober" => "true",
+ "hiddenmenu" => "true",
+ "timeout" => 10,
+ "activate" => "true",
+ "generic_mbr" => "false",
+ "trusted_grub" => "true",
+ "update_nvram" => "true",
+ "boot_boot" => "true",
+ "password" => {
"value" => "test",
"encrypted" => "true", # if changed to false, then also mock
grub2-mkpasswd
"unrestricted" => "true"
@@ -71,6 +73,9 @@
bootloader = subject.import(section)
expect(bootloader.grub_default.kernel_params.serialize).to eq "verbose
nomodeset"
+ expect(
+ bootloader.grub_default.xen_hypervisor_params.serialize
+ ).to eq "verbose nomodeset resume=/dev/sda1"
expect(bootloader.grub_default.terminal).to eq [:gfxterm]
expect(bootloader.grub_default.os_prober).to be_enabled
expect(bootloader.grub_default.hidden_timeout).to eq "10"
@@ -124,7 +129,7 @@
end
it "export to global key configuration" do
- bootloader.grub_default.kernel_params.replace("verbose nomodeset")
+ bootloader.grub_default.kernel_params.replace("verbose nomodeset
resume=/dev/sda")
bootloader.grub_default.terminal = [:gfxterm]
bootloader.grub_default.os_prober.enable
bootloader.grub_default.hidden_timeout = "10"
