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 2026-09-04 12:35:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new.1265 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Fri Sep 4 12:35:59 2026 rev:358 rq:1375115 version:5.0.42
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2026-02-11 19:12:16.096600859 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.1265/yast2-bootloader.changes
2026-09-04 12:36:05.821496069 +0200
@@ -1,0 +2,59 @@
+Mon Aug 31 11:56:44 UTC 2026 - Josef Reidinger <[email protected]>
+
+- revert "do not suggest grub2-bls if there are other systems"
+ as it breaks upgrades scenario (bsc#1258861)
+- 5.0.42
+
+-------------------------------------------------------------------
+Mon Aug 17 10:53:26 UTC 2026 - Josef Reidinger <[email protected]>
+
+- remove remaining occurrences of trusted boot to fix crash when
+ writting sysconfig for systemd-boot and grub2-bls (bsc#1274932)
+- 5.0.41
+
+-------------------------------------------------------------------
+Mon Jul 13 20:45:01 UTC 2026 - Josef Reidinger <[email protected]>
+
+- propose secure boot only for ECKD DASD (bsc#1270367)
+- 5.0.40
+
+-------------------------------------------------------------------
+Fri Jun 12 11:34:43 UTC 2026 - Stefan Schubert <[email protected]>
+
+- Reducing error level for not available shim package while using
+ systemd-boot (bsc#1265870).
+- 5.0.39
+
+-------------------------------------------------------------------
+Wed Apr 22 12:52:04 UTC 2026 - Michal Filka <[email protected]>
+
+- jsc#PED-7975 and bsc#1262249
+ - dropped trusted boot
+- 5.0.38
+
+-------------------------------------------------------------------
+Mon Mar 30 10:14:36 UTC 2026 - Stefan Schubert <[email protected]>
+
+ AutoYaST/systemd-boot export/import: Using string for
+ secure_boot setting in export file (bsc#1260385).
+- 5.0.37
+
+-------------------------------------------------------------------
+Tue Mar 10 09:00:28 UTC 2026 - Michal Filka <[email protected]>
+
+- jsc#PED-14507
+ - Removed reference to update-desktop-files from spec file
+ - 5.0.36
+-------------------------------------------------------------------
+Tue Mar 10 08:03:16 UTC 2026 - Josef Reidinger <[email protected]>
+
+- Propose always secure boot with zipl on DASD (jsc#/PED-13734)
+
+-------------------------------------------------------------------
+Wed Feb 18 14:50:25 UTC 2026 - Stefan Schubert <[email protected]>
+
+- Do not suggest grub2-bls if there is another e.g. windows
+ system installed (bsc#1257528, bsc#1257510).
+- 5.0.34
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-5.0.33.tar.bz2
New:
----
yast2-bootloader-5.0.42.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.7hUnl7/_old 2026-09-04 12:36:06.784529881 +0200
+++ /var/tmp/diff_new_pack.7hUnl7/_new 2026-09-04 12:36:06.786529951 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 5.0.33
+Version: 5.0.42
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
@@ -34,7 +34,6 @@
BuildRequires: yast2-storage-ng >= 5.0.31
# lenses needed also for tests
BuildRequires: augeas-lenses
-BuildRequires: update-desktop-files
BuildRequires: rubygem(%rb_default_ruby_abi:cfa_grub2) >= 1.0.1
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
++++++ yast2-bootloader-5.0.33.tar.bz2 -> yast2-bootloader-5.0.42.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/README.md
new/yast2-bootloader-5.0.42/README.md
--- old/yast2-bootloader-5.0.33/README.md 2026-02-10 14:03:08.000000000
+0100
+++ new/yast2-bootloader-5.0.42/README.md 2026-09-01 14:28:20.000000000
+0200
@@ -49,7 +49,7 @@
- [MBR
Update](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/MBRUpdate)
is responsible for generic MBR and stage1 if needed
- [Boot Record
backup](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/BootRecordBackup)
creates a backup of boot record for devices which the code touched
- [Serial
Console](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/SerialConsole)
converts between grub2 serial console configuration and kernel serial console
configuration
--
[Sysconfig](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/Sysconfig)
read/write sysconfig configuration for bootloader. Sysconfig basically holds
currently used grub2 implementation and configuration that is not in grub2
itself like if use secure boot or trusted grub
+-
[Sysconfig](https://www.rubydoc.info/github/yast/yast-bootloader/master/Bootloader/Sysconfig)
read/write sysconfig configuration for bootloader. Sysconfig basically holds
currently used grub2 implementation and configuration that is not in grub2
itself like if use secure boot.
### See Also
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/SUPPORTED_SCENARIOS.md
new/yast2-bootloader-5.0.42/SUPPORTED_SCENARIOS.md
--- old/yast2-bootloader-5.0.33/SUPPORTED_SCENARIOS.md 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/SUPPORTED_SCENARIOS.md 2026-09-01
14:28:20.000000000 +0200
@@ -69,7 +69,6 @@
This is the most common option and requires <b>grub2</b>. There is also
special cases that may require additional packages:
* Generic mbr binary files will require the package <b>syslinux</b>.
-* If using trusted boot option, systems with x86_64 and i386 architectures
will require the packages <b>trustedgrub2</b> and <b>trustedgrub2-i386-pc</b>.
## grub2-efi
This option requires packages based on the architecture of the system:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/package/yast2-bootloader.changes
new/yast2-bootloader-5.0.42/package/yast2-bootloader.changes
--- old/yast2-bootloader-5.0.33/package/yast2-bootloader.changes
2026-02-10 14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/package/yast2-bootloader.changes
2026-09-01 14:28:20.000000000 +0200
@@ -1,4 +1,63 @@
-------------------------------------------------------------------
+Mon Aug 31 11:56:44 UTC 2026 - Josef Reidinger <[email protected]>
+
+- revert "do not suggest grub2-bls if there are other systems"
+ as it breaks upgrades scenario (bsc#1258861)
+- 5.0.42
+
+-------------------------------------------------------------------
+Mon Aug 17 10:53:26 UTC 2026 - Josef Reidinger <[email protected]>
+
+- remove remaining occurrences of trusted boot to fix crash when
+ writting sysconfig for systemd-boot and grub2-bls (bsc#1274932)
+- 5.0.41
+
+-------------------------------------------------------------------
+Mon Jul 13 20:45:01 UTC 2026 - Josef Reidinger <[email protected]>
+
+- propose secure boot only for ECKD DASD (bsc#1270367)
+- 5.0.40
+
+-------------------------------------------------------------------
+Fri Jun 12 11:34:43 UTC 2026 - Stefan Schubert <[email protected]>
+
+- Reducing error level for not available shim package while using
+ systemd-boot (bsc#1265870).
+- 5.0.39
+
+-------------------------------------------------------------------
+Wed Apr 22 12:52:04 UTC 2026 - Michal Filka <[email protected]>
+
+- jsc#PED-7975 and bsc#1262249
+ - dropped trusted boot
+- 5.0.38
+
+-------------------------------------------------------------------
+Mon Mar 30 10:14:36 UTC 2026 - Stefan Schubert <[email protected]>
+
+ AutoYaST/systemd-boot export/import: Using string for
+ secure_boot setting in export file (bsc#1260385).
+- 5.0.37
+
+-------------------------------------------------------------------
+Tue Mar 10 09:00:28 UTC 2026 - Michal Filka <[email protected]>
+
+- jsc#PED-14507
+ - Removed reference to update-desktop-files from spec file
+ - 5.0.36
+-------------------------------------------------------------------
+Tue Mar 10 08:03:16 UTC 2026 - Josef Reidinger <[email protected]>
+
+- Propose always secure boot with zipl on DASD (jsc#/PED-13734)
+
+-------------------------------------------------------------------
+Wed Feb 18 14:50:25 UTC 2026 - Stefan Schubert <[email protected]>
+
+- Do not suggest grub2-bls if there is another e.g. windows
+ system installed (bsc#1257528, bsc#1257510).
+- 5.0.34
+
+-------------------------------------------------------------------
Tue Feb 10 11:53:30 UTC 2026 - Stefan Schubert <[email protected]>
- update BLS: Calling "sdbootutil update-all-entries" in order
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/package/yast2-bootloader.spec
new/yast2-bootloader-5.0.42/package/yast2-bootloader.spec
--- old/yast2-bootloader-5.0.33/package/yast2-bootloader.spec 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/package/yast2-bootloader.spec 2026-09-01
14:28:20.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 5.0.33
+Version: 5.0.42
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
@@ -37,7 +37,6 @@
BuildRequires: rubygem(%rb_default_ruby_abi:cfa_grub2) >= 1.0.1
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
-BuildRequires: update-desktop-files
PreReq: /bin/sed %fillup_prereq
# Base classes for inst clients
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/autoyast-rnc/bootloader.rnc
new/yast2-bootloader-5.0.42/src/autoyast-rnc/bootloader.rnc
--- old/yast2-bootloader-5.0.33/src/autoyast-rnc/bootloader.rnc 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/autoyast-rnc/bootloader.rnc 2026-09-01
14:28:20.000000000 +0200
@@ -74,6 +74,7 @@
element boot_custom { STRING }? &
element generic_mbr { STRING }? &
+ # trusted_grub is for backward compatibility only and is silently
ignored. PED-7975
element trusted_grub{ STRING }? &
element serial { STRING }? &
element terminal { STRING }? &
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/autoinst_profile/global_section.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/autoinst_profile/global_section.rb
---
old/yast2-bootloader-5.0.33/src/lib/bootloader/autoinst_profile/global_section.rb
2026-02-10 14:03:08.000000000 +0100
+++
new/yast2-bootloader-5.0.42/src/lib/bootloader/autoinst_profile/global_section.rb
2026-09-01 14:28:20.000000000 +0200
@@ -44,8 +44,6 @@
{ name: :serial },
{ name: :terminal },
{ name: :timeout },
- { name: :trusted_boot },
- { name: :trusted_grub },
{ name: :update_nvram },
{ name: :vgamode },
{ name: :xen_append },
@@ -109,10 +107,6 @@
# @!attribute timeout
# @return [Integer,nil] timeout in seconds until automatic boot.
- # @!attribute trusted_boot
- # @return [String,nil] use Trusted GRUB (only for `grub2` loader
type). Valid values
- # are "true" and "false".
-
# @!attribute update_nvram
# @return [String,nil] Update NVRAM with entry for the installed
bootloader. Valid values
# are "true" and "false".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/autoyast_converter.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/autoyast_converter.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/autoyast_converter.rb
2026-02-10 14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/autoyast_converter.rb
2026-09-01 14:28:20.000000000 +0200
@@ -51,8 +51,7 @@
bootloader.cpu_mitigations =
CpuMitigations.from_string(cpu_mitigations)
end
when "systemd-boot"
- bootloader.timeout = data.global.timeout
- bootloader.secure_boot = data.global.secure_boot
+ import_systemd_boot(data, bootloader)
else
raise UnsupportedBootloader, bootloader.name
end
@@ -82,8 +81,8 @@
export_default(global, config.grub_default)
res["global"]["cpu_mitigations"] = config.cpu_mitigations.value.to_s
when "systemd-boot"
- res["global"]["timeout"] = config.timeout
- res["global"]["secure_boot"] = config.secure_boot
+ global = res["global"]
+ export_systemd_boot(global, config)
else
raise UnsupportedBootloader, config.name
end
@@ -96,6 +95,11 @@
private
+ def import_systemd_boot(data, bootloader)
+ bootloader.timeout = data.global.timeout
+ bootloader.secure_boot = data.global.secure_boot == "true"
+ end
+
def import_grub2(data, bootloader)
return unless bootloader.name == "grub2"
@@ -271,7 +275,15 @@
end
end
- # only for grub2, not for others
+ def export_systemd_boot(res, config)
+ res["timeout"] = config.timeout
+ return if config.secure_boot.nil?
+
+ res["secure_boot"] =
+ config.secure_boot ? "true" : "false"
+ end
+
+ # only for grub2efi, not for others
GRUB2EFI_BOOLEAN_MAPPING = {
"secure_boot" => :secure_boot,
"update_nvram" => :update_nvram
@@ -287,7 +299,6 @@
# only for grub2, not for others
GRUB2_BOOLEAN_MAPPING = {
"secure_boot" => :secure_boot,
- "trusted_grub" => :trusted_boot,
"update_nvram" => :update_nvram
}.freeze
private_constant :GRUB2_BOOLEAN_MAPPING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2.rb 2026-09-01
14:28:20.000000000 +0200
@@ -67,8 +67,7 @@
if !Yast::Arch.board_powernv
if !etc_only
failed = @grub_install.execute(
- devices: stage1.devices, secure_boot: secure_boot, trusted_boot:
trusted_boot,
- update_nvram: update_nvram
+ devices: stage1.devices, secure_boot: secure_boot, update_nvram:
update_nvram
)
failed.each { |f| stage1.remove_device(f) }
end
@@ -140,16 +139,13 @@
res = super
res << "grub2"
res << "syslinux" if include_syslinux_package?
- res << "trustedgrub2" << "trustedgrub2-i386-pc" if
include_trustedgrub2_packages?
res
end
# FIXME: refactor with injection like super(prewrite: prewrite, sysconfig
= ...)
- # overwrite BootloaderBase version to save trusted boot
def write_sysconfig(prewrite: false)
sysconfig = Bootloader::Sysconfig.new(
- bootloader: name, secure_boot: secure_boot, trusted_boot: trusted_boot,
- update_nvram: update_nvram
+ bootloader: name, secure_boot: secure_boot, update_nvram: update_nvram
)
prewrite ? sysconfig.pre_write : sysconfig.write
end
@@ -168,13 +164,6 @@
stage1.generic_mbr?
end
- # @return [Boolean] true when trustedgrub2 packages should be included;
false otherwise
- def include_trustedgrub2_packages?
- return false unless trusted_boot
-
- Yast::Arch.x86_64 || Yast::Arch.i386
- end
-
def devicegraph
Y2Storage::StorageManager.instance.staging
end
@@ -326,7 +315,6 @@
def boot_flags_summary
result = []
result << secure_boot_summary if Systeminfo.secure_boot_available?(name)
- result << trusted_boot_summary if
Systeminfo.trusted_boot_available?(name)
result << update_nvram_summary if Systeminfo.nvram_available?(name)
result
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2_widgets.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2_widgets.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2_widgets.rb
2026-02-10 14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2_widgets.rb
2026-09-01 14:28:20.000000000 +0200
@@ -206,61 +206,6 @@
end
end
- # Represents switcher for Trusted Boot
- class TrustedBootWidget < CWM::CheckBox
- include Grub2Helper
-
- def initialize
- textdomain "bootloader"
-
- super
- end
-
- def label
- _("&Trusted Boot Support")
- end
-
- def help
- res = _("<p><b>Trusted Boot</b> " \
- "means measuring the integrity of the boot process,\n" \
- "with the help from the hardware (a TPM, Trusted Platform
Module,\n" \
- "chip).\n")
- if grub2.name == "grub2"
- res += _("First you need to make sure Trusted Boot is enabled in the
BIOS\n" \
- "setup (the setting may be named \"Security Chip\", for
example).\n")
- end
-
- res += "</p>"
-
- res
- end
-
- def init
- self.value = grub2.trusted_boot
- end
-
- def store
- grub2.trusted_boot = value
- end
-
- def validate
- return true if Yast::Mode.config || !value || ["grub2-efi",
-
"grub2-bls"].include?(grub2.name)
-
- tpm_files = Dir.glob("/sys/**/pcrs")
- if !tpm_files.empty? && !File.read(tpm_files[0], 1).nil?
- # check for file size does not work, since FS reports it 4096
- # even if the file is in fact empty and a single byte cannot
- # be read, therefore testing real reading (details: bsc#994556)
- return true
- end
-
- Yast::Popup.ContinueCancel(_("Trusted Platform Module not found.\n" \
- "Make sure it is enabled in BIOS.\n" \
- "The system will not boot otherwise."))
- end
- end
-
# Represents grub password protection widget
class GrubPasswordWidget < CWM::CustomWidget
include Grub2Helper
@@ -863,7 +808,6 @@
end
w << SecureBootWidget.new if secure_boot_widget?
- w << TrustedBootWidget.new if trusted_boot_widget?
w << UpdateNvramWidget.new if update_nvram_widget?
w.map do |widget|
@@ -899,10 +843,6 @@
Systeminfo.secure_boot_available?(grub2.name)
end
- def trusted_boot_widget?
- Systeminfo.trusted_boot_available?(grub2.name)
- end
-
def update_nvram_widget?
Systeminfo.nvram_available?(grub2.name)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2base.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2base.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2base.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2base.rb 2026-09-01
14:28:20.000000000 +0200
@@ -45,10 +45,6 @@
attr_accessor :pmbr_action
- # @!attribute trusted_boot
- # @return [Boolean] current trusted boot setting
- attr_accessor :trusted_boot
-
# @!attribute secure_boot
# @return [Boolean] current secure boot setting
attr_accessor :secure_boot
@@ -111,7 +107,6 @@
@sections = ::Bootloader::Sections.new(grub_cfg)
log.info "grub sections: #{@sections.all}"
- self.trusted_boot = Systeminfo.trusted_boot_active?
self.secure_boot = Systeminfo.secure_boot_active?
self.update_nvram = Systeminfo.update_nvram_active?
end
@@ -140,7 +135,6 @@
propose_serial
propose_xen_hypervisor
- self.trusted_boot = false
self.secure_boot = Systeminfo.secure_boot_supported?
self.update_nvram = true
end
@@ -153,7 +147,6 @@
merge_pmbr_action(other)
merge_sections(other)
- self.trusted_boot = other.trusted_boot unless other.trusted_boot.nil?
self.secure_boot = other.secure_boot unless other.secure_boot.nil?
self.update_nvram = other.update_nvram unless other.update_nvram.nil?
end
@@ -393,19 +386,6 @@
"#{_("Secure Boot:")} #{status_string(secure_boot)} #{link}"
end
- # Trusted boot setting shown in summary screen.
- #
- # @return [String]
- def trusted_boot_summary
- link = if trusted_boot
- "<a href=\"disable_trusted_boot\">(#{_("disable")})</a>"
- else
- "<a href=\"enable_trusted_boot\">(#{_("enable")})</a>"
- end
-
- "#{_("Trusted Boot:")} #{status_string(trusted_boot)} #{link}"
- end
-
# Update nvram shown in summary screen
#
# @return [String]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2bls.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2bls.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2bls.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2bls.rb 2026-09-01
14:28:20.000000000 +0200
@@ -160,8 +160,7 @@
# overwrite BootloaderBase version to save secure boot
def write_sysconfig(prewrite: false)
sysconfig = Bootloader::Sysconfig.new(bootloader: name,
- secure_boot: secure_boot, trusted_boot: false,
- update_nvram: update_nvram)
+ secure_boot: secure_boot, update_nvram: update_nvram)
prewrite ? sysconfig.pre_write : sysconfig.write
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2efi.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2efi.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/grub2efi.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/grub2efi.rb 2026-09-01
14:28:20.000000000 +0200
@@ -30,10 +30,7 @@
Pmbr.write_efi(pmbr_action)
- unless etc_only
- @grub_install.execute(secure_boot: secure_boot, trusted_boot:
trusted_boot,
- update_nvram: update_nvram)
- end
+ @grub_install.execute(secure_boot: secure_boot, update_nvram:
update_nvram) unless etc_only
true
end
@@ -60,7 +57,6 @@
]
result << secure_boot_summary if Systeminfo.secure_boot_available?(name)
- result << trusted_boot_summary if
Systeminfo.trusted_boot_available?(name)
result << update_nvram_summary if Systeminfo.nvram_available?(name)
result
@@ -96,8 +92,7 @@
# 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: update_nvram)
+ secure_boot: secure_boot, update_nvram: update_nvram)
prewrite ? sysconfig.pre_write : sysconfig.write
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/grub_install.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/grub_install.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/grub_install.rb
2026-02-10 14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/grub_install.rb
2026-09-01 14:28:20.000000000 +0200
@@ -24,10 +24,9 @@
# @param devices[Array<String>] list of devices where grub2 should be
installed.
# Ignored when grub2 does not need device.
# @param secure_boot [Boolean] if secure boot variant should be used
- # @param trusted_boot [Boolean] if trusted boot variant should be used
# @param update_nvram [Boolean] if bootloader entry should be added to
nvram
# @return [Array<String>] list of devices for which install failed
- def execute(devices: [], secure_boot: false, trusted_boot: false,
update_nvram: true)
+ def execute(devices: [], secure_boot: false, update_nvram: true)
if secure_boot && !Systeminfo.secure_boot_available?(@grub2_name)
# There might be some secure boot setting left over when the
# bootloader had been switched.
@@ -36,7 +35,7 @@
log.warn "Ignoring secure boot setting on this machine"
end
- cmd = basic_cmd(secure_boot, trusted_boot, update_nvram)
+ cmd = basic_cmd(secure_boot, update_nvram)
if no_device_install?
Yast::Execute.on_target(cmd)
@@ -84,7 +83,7 @@
# creates basic command for grub2 install without specifying any stage1
# locations
- def basic_cmd(secure_boot, trusted_boot, update_nvram)
+ def basic_cmd(secure_boot, update_nvram)
if Systeminfo.shim_needed?(@grub2_name, secure_boot)
cmd = ["/usr/sbin/shim-install", "--config-file=/boot/grub2/grub.cfg"]
else
@@ -94,10 +93,6 @@
cmd << "--force" << "--skip-fs-probe"
end
- if trusted_boot
- cmd << (efi ? "--suse-enable-tpm" :
"--directory=/usr/lib/trustedgrub2/#{target}")
- end
-
cmd << "--removable" if removable_efi?
cmd << "--no-nvram" if !update_nvram
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/proposal_client.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/proposal_client.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/proposal_client.rb
2026-02-10 14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/proposal_client.rb
2026-09-01 14:28:20.000000000 +0200
@@ -89,9 +89,7 @@
"enable_secure_boot",
"disable_secure_boot",
"enable_update_nvram",
- "disable_update_nvram",
- "enable_trusted_boot",
- "disable_trusted_boot"
+ "disable_update_nvram"
].freeze
def make_proposal(attrs)
@@ -378,8 +376,6 @@
devices.each do |device|
value ? stage1.add_udev_device(device) : stage1.remove_device(device)
end
- when "trusted_boot"
- bootloader.trusted_boot = value
when "update_nvram"
bootloader.update_nvram = value
when "secure_boot"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/sysconfig.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/sysconfig.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/sysconfig.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/sysconfig.rb 2026-09-01
14:28:20.000000000 +0200
@@ -13,7 +13,6 @@
ATTR_VALUE_MAPPING = {
bootloader: "LOADER_TYPE",
secure_boot: "SECURE_BOOT",
- trusted_boot: "TRUSTED_BOOT",
update_nvram: "UPDATE_NVRAM"
}.freeze
@@ -21,16 +20,13 @@
attr_accessor :bootloader
# @return [Boolean] if secure boot should be used
attr_accessor :secure_boot
- # @return [Boolean] if trusted boot should be used
- attr_accessor :trusted_boot
# @return [Boolean] if nvram should be updated
attr_accessor :update_nvram
- def initialize(bootloader: nil, secure_boot: false, trusted_boot: false,
update_nvram: true)
+ def initialize(bootloader: nil, secure_boot: false, update_nvram: true)
@sys_agent = AGENT_PATH
@bootloader = bootloader
@secure_boot = secure_boot
- @trusted_boot = trusted_boot
@update_nvram = update_nvram
end
@@ -40,12 +36,9 @@
# but only on architectures that support it
secure_boot = Yast::SCR.Read(AGENT_PATH + "SECURE_BOOT") != "no"
- trusted_boot = Yast::SCR.Read(AGENT_PATH + "TRUSTED_BOOT") == "yes"
-
update_nvram = Yast::SCR.Read(AGENT_PATH + "UPDATE_NVRAM") != "no"
- new(bootloader: bootloader, secure_boot: secure_boot, trusted_boot:
trusted_boot,
- update_nvram: update_nvram)
+ new(bootloader: bootloader, secure_boot: secure_boot, update_nvram:
update_nvram)
end
# Specialized write before rpm install, that do not have switched SCR
@@ -81,16 +74,6 @@
"#\n" \
"#\n",
- trusted_boot: "\n" \
- "## Path:\tSystem/Bootloader\n" \
- "## Description:\tBootloader configuration\n" \
- "## Type:\tyesno\n" \
- "## Default:\t\"no\"\n" \
- "#\n" \
- "# Enable Trusted Boot support\n" \
- "# Only available on hardware with a Trusted Platform
Module.\n" \
- "#\n",
-
update_nvram: "\n" \
"## Path:\tSystem/Bootloader\n" \
"## Description:\tBootloader configuration\n" \
@@ -110,9 +93,6 @@
sb = secure_boot ? "yes" : "no"
write_option(:secure_boot, sb)
- tb = trusted_boot ? "yes" : "no"
- write_option(:trusted_boot, tb)
-
un = update_nvram ? "yes" : "no"
write_option(:update_nvram, un)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/systemdboot.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/systemdboot.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/systemdboot.rb
2026-02-10 14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/systemdboot.rb
2026-09-01 14:28:20.000000000 +0200
@@ -221,7 +221,7 @@
if ["x86_64", "aarch64"].include?(Yast::Arch.architecture)
res << "shim"
else
- log.warn "Unknown architecture #{Yast::Arch.architecture} for
systemd-boot"
+ log.info "No \"shim\" support for systemd-boot and
#{Yast::Arch.architecture}."
end
res
@@ -234,8 +234,7 @@
# overwrite BootloaderBase version to save secure boot
def write_sysconfig(prewrite: false)
sysconfig = Bootloader::Sysconfig.new(bootloader: name,
- secure_boot: secure_boot, trusted_boot: false,
- update_nvram: update_nvram)
+ secure_boot: secure_boot, update_nvram: update_nvram)
prewrite ? sysconfig.pre_write : sysconfig.write
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/src/lib/bootloader/systeminfo.rb
new/yast2-bootloader-5.0.42/src/lib/bootloader/systeminfo.rb
--- old/yast2-bootloader-5.0.33/src/lib/bootloader/systeminfo.rb
2026-02-10 14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/src/lib/bootloader/systeminfo.rb
2026-09-01 14:28:20.000000000 +0200
@@ -76,17 +76,6 @@
"grub2-bls"].include?(bootloader_name)
end
- # Check current trusted boot state.
- #
- # ATM this just returns the config file setting.
- #
- # @return [Boolean] true if trusted boot is currently active
- def trusted_boot_active?
- # FIXME: this should probably be a real check as in
Grub2Widget#validate
- # and then Grub2Widget#validate could use
Systeminfo.trusted_boot_active?
- Sysconfig.from_system.trusted_boot
- end
-
# Check if the system is expected to have nvram - ie.
update_nvram_active? makes a difference
def nvram_available?(bootloader_name = nil)
(bootloader_name ? efi_used?(bootloader_name) : efi_supported?) ||
Yast::Arch.ppc
@@ -96,23 +85,6 @@
Sysconfig.from_system.update_nvram
end
- # Check if trusted boot is configurable with a bootloader.
- #
- # param bootloader_name [String] bootloader name
- # @return [Boolean] true if trusted boot setting is available with this
bootloader
- def trusted_boot_available?(bootloader_name)
- # TPM availability is must have
- return false unless File.exist?("/dev/tpm0")
- # not for grub2-bls
- return false if bootloader_name == "grub2-bls"
-
- # for details about grub2 efi trusted boot support see FATE#315831
- (
- bootloader_name == "grub2" &&
- (Yast::Arch.x86_64 || Yast::Arch.i386)
- ) || bootloader_name == "grub2-efi"
- end
-
# Check if UEFI will be used.
#
# param bootloader_name [String] bootloader name
@@ -228,7 +200,12 @@
def s390_secure_boot_supported?
return false unless Yast::Arch.s390
- s390_secure_boot_available? && scsi?(zipl_device)
+ zipl_dev = zipl_device
+ # for ECKD DASD zipl install both modes, so secure boot can be always
+ # enabled (jsc#PED-13734)
+ return true if dasd?(zipl_dev)
+
+ s390_secure_boot_available? && scsi?(zipl_dev)
end
# Check if secure boot is currently active on an s390 machine.
@@ -324,6 +301,26 @@
false
end
+ # Check if device is a ECKD DASD device.
+ #
+ # @see
https://www.ibm.com/docs/en/linux-on-systems?topic=linux-secure-boot#secure_boot
+ #
+ # param device [Y2Storage::Partition, NilClass] partition device (or nil)
+ #
+ # @return [Boolean] true if device is a DASD device
+ def dasd?(device)
+ return false unless device
+
+ if device.is?(:partition)
+ disk = device.partitionable
+ return false unless disk
+
+ dasd?(disk)
+ else
+ device.is?(:dasd) && device.type == Y2Storage::DasdType::ECKD
+ end
+ end
+
def efi?
Y2Storage::Arch.new.efiboot?
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.33/test/autoyast_converter_test.rb
new/yast2-bootloader-5.0.42/test/autoyast_converter_test.rb
--- old/yast2-bootloader-5.0.33/test/autoyast_converter_test.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/test/autoyast_converter_test.rb 2026-09-01
14:28:20.000000000 +0200
@@ -58,7 +58,6 @@
"timeout" => 10,
"activate" => "true",
"generic_mbr" => "false",
- "trusted_grub" => "true",
"update_nvram" => "true",
"boot_boot" => "true",
"password" => {
@@ -82,7 +81,6 @@
expect(bootloader.grub_default.hidden_timeout).to eq "10"
expect(bootloader.stage1).to be_activate
expect(bootloader.stage1.boot_partition?).to eq true
- expect(bootloader.trusted_boot).to eq true
expect(bootloader.update_nvram).to eq true
expect(bootloader.password.used?).to eq true
expect(bootloader.password.unrestricted?).to eq true
@@ -120,7 +118,7 @@
it "supports systemd-boot bootloader" do
data = {
"loader_type" => "systemd-boot",
- "global" => { "secure_boot" => true,
+ "global" => { "secure_boot" => "true",
"timeout" => 30 }
}
@@ -149,7 +147,6 @@
bootloader.grub_default.os_prober.enable
bootloader.grub_default.hidden_timeout = "10"
bootloader.stage1.activate = true
- bootloader.trusted_boot = true
bootloader.password.unrestricted = false
bootloader.password.used = true
bootloader.password.encrypted_password = "blabla"
@@ -160,7 +157,6 @@
"os_prober" => "true",
"hiddenmenu" => "true",
"timeout" => 10,
- "trusted_grub" => "true",
"update_nvram" => "true",
"cpu_mitigations" => "manual",
"password" => {
@@ -191,7 +187,7 @@
it "exports secure boot key" do
bootloader.secure_boot = true
- expect(subject.export(bootloader)["global"]["secure_boot"]).to eq true
+ expect(subject.export(bootloader)["global"]["secure_boot"]).to eq
"true"
end
it "exports timeout key" do
bootloader.timeout = 20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/test/data/dasd_eckd.yml
new/yast2-bootloader-5.0.42/test/data/dasd_eckd.yml
--- old/yast2-bootloader-5.0.33/test/data/dasd_eckd.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-bootloader-5.0.42/test/data/dasd_eckd.yml 2026-09-01
14:28:20.000000000 +0200
@@ -0,0 +1,39 @@
+---
+- dasd:
+ name: /dev/dasda
+ type: eckd
+ size: 50 GiB
+ partition_table: gpt
+ partitions:
+
+ - partition:
+ size: 300 MiB
+ name: /dev/dasda1
+ id: linux
+ file_system: ext2
+ mount_point: /boot/zipl
+
+ - partition:
+ size: 25685 MiB
+ name: /dev/dasda2
+ id: linux
+ file_system: btrfs
+ mount_point: "/"
+
+ - partition:
+ size: 2 GiB
+ name: /dev/dasda3
+ id: swap
+ file_system: swap
+ mount_point: swap
+
+ - partition:
+ size: unlimited
+ name: /dev/dasda4
+ id: linux
+ file_system: xfs
+ mount_point: /home
+
+ # The final 16.5 KiB are reserved by GPT
+ - free:
+ size: 16.5 KiB
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/test/data/dasd_fba.yml
new/yast2-bootloader-5.0.42/test/data/dasd_fba.yml
--- old/yast2-bootloader-5.0.33/test/data/dasd_fba.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-bootloader-5.0.42/test/data/dasd_fba.yml 2026-09-01
14:28:20.000000000 +0200
@@ -0,0 +1,39 @@
+---
+- dasd:
+ name: /dev/dasda
+ type: fba
+ size: 50 GiB
+ partition_table: gpt
+ partitions:
+
+ - partition:
+ size: 300 MiB
+ name: /dev/dasda1
+ id: linux
+ file_system: ext2
+ mount_point: /boot/zipl
+
+ - partition:
+ size: 25685 MiB
+ name: /dev/dasda2
+ id: linux
+ file_system: btrfs
+ mount_point: "/"
+
+ - partition:
+ size: 2 GiB
+ name: /dev/dasda3
+ id: swap
+ file_system: swap
+ mount_point: swap
+
+ - partition:
+ size: unlimited
+ name: /dev/dasda4
+ id: linux
+ file_system: xfs
+ mount_point: /home
+
+ # The final 16.5 KiB are reserved by GPT
+ - free:
+ size: 16.5 KiB
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/test/grub2_efi_test.rb
new/yast2-bootloader-5.0.42/test/grub2_efi_test.rb
--- old/yast2-bootloader-5.0.33/test/grub2_efi_test.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/test/grub2_efi_test.rb 2026-09-01
14:28:20.000000000 +0200
@@ -23,13 +23,12 @@
describe "#read" do
it "reads bootloader flags from sysconfig" do
- sysconfig = double(Bootloader::Sysconfig, secure_boot: true,
trusted_boot: true, update_nvram: true)
+ sysconfig = double(Bootloader::Sysconfig, secure_boot: true,
update_nvram: true)
expect(Bootloader::Sysconfig).to
receive(:from_system).and_return(sysconfig).at_least(:once)
subject.read
expect(subject.secure_boot).to eq true
- expect(subject.trusted_boot).to eq true
expect(subject.update_nvram).to eq true
end
end
@@ -48,11 +47,10 @@
# This test fails (only!) in Travis with
# Failure/Error: subject.write Storage::Exception: Storage::Exception
grub_install = double(Bootloader::GrubInstall)
- expect(grub_install).to receive(:execute).with(secure_boot: true,
trusted_boot: true, update_nvram: false)
+ expect(grub_install).to receive(:execute).with(secure_boot: true,
update_nvram: false)
allow(Bootloader::GrubInstall).to receive(:new).and_return(grub_install)
subject.secure_boot = true
- subject.trusted_boot = true
subject.update_nvram = false
subject.write
@@ -76,12 +74,11 @@
# This test fails (only!) in Travis with
# Failure/Error: subject.write Storage::Exception: Storage::Exception
expect(Bootloader::Sysconfig).to receive(:new)
- .with(bootloader: "grub2-efi", secure_boot: true, trusted_boot: true,
update_nvram: true)
+ .with(bootloader: "grub2-efi", secure_boot: true, update_nvram: true)
.and_return(sysconfig)
expect(sysconfig).to receive(:write)
subject.secure_boot = true
- subject.trusted_boot = true
subject.update_nvram = true
subject.prepare
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/test/grub2_test.rb
new/yast2-bootloader-5.0.42/test/grub2_test.rb
--- old/yast2-bootloader-5.0.33/test/grub2_test.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/test/grub2_test.rb 2026-09-01
14:28:20.000000000 +0200
@@ -83,10 +83,9 @@
grub2_install = double(Bootloader::GrubInstall)
expect(grub2_install).to receive(:execute)
- .with(devices: ["/dev/sda", "/dev/sdb1"], secure_boot: nil,
trusted_boot: false, update_nvram: true).and_return([])
+ .with(devices: ["/dev/sda", "/dev/sdb1"], secure_boot: nil,
update_nvram: true).and_return([])
expect(Bootloader::GrubInstall).to receive(:new).with(efi:
false).and_return(grub2_install)
- subject.trusted_boot = false
subject.write
expect(grub2_install).to_not receive(:execute)
@@ -192,45 +191,6 @@
end
end
- context "when trusted boot is required" do
- before do
- allow(subject).to receive(:trusted_boot).and_return(true)
- end
-
- context "and is x86_64 architecture" do
- before do
- allow(Yast::Arch).to receive(:x86_64).and_return(true)
- end
-
- it "contains trustedgrub2 packages" do
- expect(subject.packages).to include("trustedgrub2")
- expect(subject.packages).to include("trustedgrub2-i386-pc")
- end
- end
-
- context "and is i386 architecture" do
- before do
- allow(Yast::Arch).to receive(:x86_64).and_return(true)
- end
-
- it "contains trustedgrub2 packages" do
- expect(subject.packages).to include("trustedgrub2")
- expect(subject.packages).to include("trustedgrub2-i386-pc")
- end
- end
- end
-
- context "when trusted boot is not required" do
- before do
- allow(subject).to receive(:trusted_boot).and_return(false)
- end
-
- it "does not contain the trusted grub packages" do
- expect(subject.packages).to_not include("trustedgrub2")
- expect(subject.packages).to_not include("trustedgrub2-i386-pc")
- end
- end
-
context "on non-s390 architectures" do
before do
allow(Yast::Arch).to receive(:s390).and_return(false)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/test/grub2_widgets_test.rb
new/yast2-bootloader-5.0.42/test/grub2_widgets_test.rb
--- old/yast2-bootloader-5.0.33/test/grub2_widgets_test.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/test/grub2_widgets_test.rb 2026-09-01
14:28:20.000000000 +0200
@@ -238,10 +238,6 @@
end
end
-describe Bootloader::Grub2Widget::TrustedBootWidget do
- include_examples "CWM::AbstractWidget"
-end
-
describe Bootloader::Grub2Widget::GrubPasswordWidget do
before do
assign_bootloader
@@ -663,23 +659,6 @@
end
end
-describe Bootloader::Grub2Widget::TrustedBootWidget do
- before do
- assign_bootloader
- end
-
- it_behaves_like "labeled widget"
-
- it "check if trusted platform is found for legacy boot when enabled" do
- expect(Dir).to receive(:glob).and_return([])
- expect(Yast::Popup).to receive(:ContinueCancel).and_return(false)
-
- allow(subject).to receive(:value).and_return(true)
-
- expect(subject.validate).to eq false
- end
-end
-
describe Bootloader::Grub2Widget::KernelTab do
before do
assign_bootloader
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/test/grub2base_test.rb
new/yast2-bootloader-5.0.42/test/grub2base_test.rb
--- old/yast2-bootloader-5.0.33/test/grub2base_test.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/test/grub2base_test.rb 2026-09-01
14:28:20.000000000 +0200
@@ -47,22 +47,6 @@
expect { subject.read }.to_not raise_error
end
- it "reads trusted boot configuration from sysconfig" do
- mocked_sysconfig = ::Bootloader::Sysconfig.new(trusted_boot: true)
- allow(::Bootloader::Sysconfig).to
receive(:from_system).and_return(mocked_sysconfig)
-
- subject.read
-
- expect(subject.trusted_boot).to eq true
-
- mocked_sysconfig = ::Bootloader::Sysconfig.new(trusted_boot: false)
- allow(::Bootloader::Sysconfig).to
receive(:from_system).and_return(mocked_sysconfig)
-
- subject.read
-
- expect(subject.trusted_boot).to eq false
- end
-
it "reads update nvram configuration from sysconfig" do
mocked_sysconfig = ::Bootloader::Sysconfig.new(update_nvram: true)
allow(::Bootloader::Sysconfig).to
receive(:from_system).and_return(mocked_sysconfig)
@@ -466,12 +450,6 @@
expect(subject.grub_default.distributor).to eq ""
end
- it "proposes to disable trusted boot" do
- subject.propose
-
- expect(subject.trusted_boot).to eq false
- end
-
it "proposes to update nvram" do
subject.propose
@@ -629,14 +607,5 @@
expect(subject.pmbr_action).to eq :nothing
end
-
- it "overwrites trusted boot configuration if merged define it" do
- subject.trusted_boot = true
- other.trusted_boot = false
-
- subject.merge(other)
-
- expect(subject.trusted_boot).to eq false
- end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/test/grub_install_test.rb
new/yast2-bootloader-5.0.42/test/grub_install_test.rb
--- old/yast2-bootloader-5.0.33/test/grub_install_test.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/test/grub_install_test.rb 2026-09-01
14:28:20.000000000 +0200
@@ -127,17 +127,6 @@
subject.execute(update_nvram: false)
end
-
- it "passes suse-enable-tpm option when trusted boot is requested" do
- stub_arch("x86_64")
- stub_efivars(removable: false)
-
- expect(Yast::Execute).to receive(:on_target) do |arg|
- expect(arg).to include("--suse-enable-tpm")
- end
-
- subject.execute(trusted_boot: true)
- end
end
context "initialized with efi:false" do
@@ -223,16 +212,6 @@
subject.execute(devices: [])
end
- it "pass directory argument when trusted boot is requested" do
- stub_arch("x86_64")
-
- expect(Yast::Execute).to receive(:on_target!) do |arg|
- expect(arg).to include("--directory=/usr/lib/trustedgrub2/i386-pc")
- end
-
- subject.execute(devices: ["/dev/sda"], trusted_boot: true)
- end
-
it "raise exception on aarch64" do
stub_arch("aarch64")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.33/test/systeminfo_test.rb
new/yast2-bootloader-5.0.42/test/systeminfo_test.rb
--- old/yast2-bootloader-5.0.33/test/systeminfo_test.rb 2026-02-10
14:03:08.000000000 +0100
+++ new/yast2-bootloader-5.0.42/test/systeminfo_test.rb 2026-09-01
14:28:20.000000000 +0200
@@ -165,80 +165,6 @@
end
end
- describe ".trusted_boot_active?" do
- context "if TRUSTED_BOOT is 'yes' in sysconfig" do
- it "returns true" do
- allow(Yast::SCR).to receive(:Read).with(
- Yast::Path.new(".sysconfig.bootloader.TRUSTED_BOOT")
- ).and_return("yes")
- expect(described_class.trusted_boot_active?).to be true
- end
- end
-
- context "if TRUSTED_BOOT is 'no' in sysconfig" do
- it "returns true" do
- allow(Yast::SCR).to receive(:Read).with(
- Yast::Path.new(".sysconfig.bootloader.TRUSTED_BOOT")
- ).and_return("no")
- expect(described_class.trusted_boot_active?).to be false
- end
- end
- end
-
- describe ".trusted_boot_available?" do
- before do
- allow(File).to receive(:exist?).with("/dev/tpm0").and_return(true)
- end
-
- context "when tpm device does not exist" do
- it "returns false" do
- allow(File).to receive(:exist?).with("/dev/tpm0").and_return(false)
- expect(described_class.trusted_boot_available?("grub2-efi")).to be
false
- expect(described_class.trusted_boot_available?("grub2")).to be false
- end
- end
-
- context "if bootloader is grub2" do
- context "and arch is x86_64" do
- let(:arch) { "x86_64" }
-
- it "returns true" do
- expect(described_class.trusted_boot_available?("grub2")).to be true
- end
- end
-
- context "and arch is i386" do
- let(:arch) { "i386" }
-
- it "returns true" do
- expect(described_class.trusted_boot_available?("grub2")).to be true
- end
- end
-
- context "and arch is ppc64" do
- let(:arch) { "ppc64" }
-
- it "returns false" do
- expect(described_class.trusted_boot_available?("grub2")).to be false
- end
- end
-
- context "and arch is s390x" do
- let(:arch) { "s390_64" }
-
- it "returns false" do
- expect(described_class.trusted_boot_available?("grub2")).to be false
- end
- end
- end
-
- context "if bootloader is grub2-efi" do
- it "returns true" do
- expect(described_class.trusted_boot_available?("grub2-efi")).to be true
- end
- end
- end
-
describe ".efi_used?" do
context "if bootloader is grub2-efi" do
it "returns true" do
@@ -387,6 +313,22 @@
context "if arch is s390x" do
let(:arch) { "s390_64" }
+ context "and zipl is on DASD disk with ECKD" do
+ it "returns true" do
+ devicegraph_stub("dasd_eckd.yml")
+
+ expect(described_class.s390_secure_boot_supported?).to be true
+ end
+ end
+
+ context "and zipl is on DASD disk with FBA (bsc#1270367)" do
+ it "returns false" do
+ devicegraph_stub("dasd_fba.yml")
+
+ expect(described_class.s390_secure_boot_supported?).to be false
+ end
+ end
+
context "and has_secure is 1" do
context "and zipl is on a SCSI disk" do
it "returns true" do
