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 2024-05-05 12:10:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Sun May 5 12:10:33 2024 rev:338 rq:1171823 version:5.0.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2024-05-01 14:55:48.468505444 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.1880/yast2-bootloader.changes
2024-05-05 12:10:51.260025897 +0200
@@ -1,0 +2,7 @@
+Fri May 3 13:07:26 UTC 2024 - Stefan Schubert <schubi@localhost>
+
+- Writing "root" entry into /etc/kernel/cmdline which is needed by
+ sdbootutil. (still for bsc#1220892)
+- 5.0.10
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-5.0.9.tar.bz2
New:
----
yast2-bootloader-5.0.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.gcvEpp/_old 2024-05-05 12:10:51.748043558 +0200
+++ /var/tmp/diff_new_pack.gcvEpp/_new 2024-05-05 12:10:51.752043704 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 5.0.9
+Version: 5.0.10
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
++++++ yast2-bootloader-5.0.9.tar.bz2 -> yast2-bootloader-5.0.10.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.9/package/yast2-bootloader.changes
new/yast2-bootloader-5.0.10/package/yast2-bootloader.changes
--- old/yast2-bootloader-5.0.9/package/yast2-bootloader.changes 2024-04-30
13:43:36.000000000 +0200
+++ new/yast2-bootloader-5.0.10/package/yast2-bootloader.changes
2024-05-03 18:45:40.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri May 3 13:07:26 UTC 2024 - Stefan Schubert <schubi@localhost>
+
+- Writing "root" entry into /etc/kernel/cmdline which is needed by
+ sdbootutil. (still for bsc#1220892)
+- 5.0.10
+
+-------------------------------------------------------------------
Fri Apr 26 13:07:51 UTC 2024 - Stefan Schubert <sch...@suse.com>
- Creating kernel options for systemd-boot. (bsc#1220892)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.9/package/yast2-bootloader.spec
new/yast2-bootloader-5.0.10/package/yast2-bootloader.spec
--- old/yast2-bootloader-5.0.9/package/yast2-bootloader.spec 2024-04-30
13:43:36.000000000 +0200
+++ new/yast2-bootloader-5.0.10/package/yast2-bootloader.spec 2024-05-03
18:45:40.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 5.0.9
+Version: 5.0.10
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-5.0.9/src/lib/bootloader/systemdboot.rb
new/yast2-bootloader-5.0.10/src/lib/bootloader/systemdboot.rb
--- old/yast2-bootloader-5.0.9/src/lib/bootloader/systemdboot.rb
2024-04-30 13:43:36.000000000 +0200
+++ new/yast2-bootloader-5.0.10/src/lib/bootloader/systemdboot.rb
2024-05-03 18:45:40.000000000 +0200
@@ -112,15 +112,10 @@
def write(etc_only: false)
super
log.info("Writing settings...")
- if Yast::Stage.initial # while new installation only (currently)
- install_bootloader
- create_menue_entries
- end
+ install_bootloader if Yast::Stage.initial # while new installation only
(currently)
+ create_menue_entries
write_menue_timeout
- File.open(File.join(Yast::Installation.destdir, CMDLINE), "w+") do |fw|
- fw.puts(kernel_params.serialize)
- end
true
end
@@ -205,17 +200,15 @@
SDBOOTUTIL = "/usr/bin/sdbootutil"
def create_menue_entries
- cmdline_file = File.join(Yast::Installation.destdir, CMDLINE)
- if Yast::Stage.initial
- # sdbootutil script needs the "root=<device>" entry in kernel
parameters.
- # This will be written to CMDLINE which will be used in an
- # installed system by the administrator only. So we can use it because
- # the system will be installed new. This file will be deleted after
- # calling sdbootutil.
- File.open(cmdline_file, "w+") do |fw|
- fw.puts("root=#{Yast::BootStorage.root_partitions.first.name}")
+ # writing kernel parameter to /etc/kernel/cmdline
+ File.open(File.join(Yast::Installation.destdir, CMDLINE), "w+") do |fw|
+ if Yast::Stage.initial # while new installation only
+ fw.puts("root=#{Yast::BootStorage.root_partitions.first.name}
#{kernel_params.serialize}")
+ else # root entry is already available
+ fw.puts(kernel_params.serialize)
end
end
+
begin
Yast::Execute.on_target!(SDBOOTUTIL, "--verbose", "add-all-kernels")
rescue Cheetah::ExecutionFailed => e
@@ -227,7 +220,6 @@
), command: e.commands.inspect, stderr: e.stderr)
)
end
- File.delete(cmdline_file) if Yast::Stage.initial # see above
end
def read_menue_timeout
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.9/test/systemdboot_test.rb
new/yast2-bootloader-5.0.10/test/systemdboot_test.rb
--- old/yast2-bootloader-5.0.9/test/systemdboot_test.rb 2024-04-30
13:43:36.000000000 +0200
+++ new/yast2-bootloader-5.0.10/test/systemdboot_test.rb 2024-05-03
18:45:40.000000000 +0200
@@ -71,7 +71,7 @@
# Checking written kernel parameters
subject.read
expect(subject.cpu_mitigations.to_human_string).to eq "Off"
- expect(subject.kernel_params.serialize).to eq cmdline_content
+ expect(subject.kernel_params.serialize).to include cmdline_content
end
it "creates menue entries" do
@@ -137,7 +137,7 @@
expect(subject.secure_boot).to eq true
expect(subject.menue_timeout).to eq 12
expect(subject.cpu_mitigations.to_human_string).to eq "Auto"
- expect(subject.kernel_params.serialize).to eq "security=apparmor
splash=silent quiet mitigations=auto"
+ expect(subject.kernel_params.serialize).to include "security=apparmor
splash=silent quiet mitigations=auto"
end
end
