pool/shim
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1116629 from devel:openSUSE:Factory

Browse Source 
- Don't require grub so shim can still be used with systemd-boot (forwarded request 1115842 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/1116629
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim?expand=0&rev=114
This commit is contained in:
Ana Guerrero 2023-10-10 18:52:13 +00:00 committed by Git OBS Bridge
commit 3ec9adf395
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shim-install
View File

@ -419,8 +419,19 @@ if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then
done
fi
hints="`"${grub_probe}" --target=hints_string "${grub_cfg_dirname}" 2> /dev/null`"
if [ "x$hints" != x ]; then
echo "if [ x\$feature_platform_search_hint = xy ]; then"
echo " search --no-floppy --fs-uuid --set=root ${hints} ${cfg_fs_uuid}"
echo "else"
echo " search --no-floppy --fs-uuid --set=root ${cfg_fs_uuid}"
echo "fi"
else
echo "search --no-floppy --fs-uuid --set=root ${cfg_fs_uuid}"
fi
cat <<EOF
search --fs-uuid --set=root ${cfg_fs_uuid}
set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
source "\${prefix}/${grub_cfg_basename}"
EOF

18
shim.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Oct 5 13:19:48 UTC 2023 - Ludwig Nussel <lnussel@suse.com>
- Don't require grub so shim can still be used with systemd-boot
-------------------------------------------------------------------
Wed Sep 20 04:33:59 UTC 2023 - Michael Chang <mchang@suse.com>
- Update shim-install to fix boot failure of ext4 root file system
on RAID10 (bsc#1205855)
226c94ca5cfca Use hint in looking for root if possible
-------------------------------------------------------------------
Tue Sep 19 08:36:17 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>
- Adopt the macros from fde-tpm-helper-macros to update the
signature in the sealed key after a bootloader upgrade
-------------------------------------------------------------------
Mon May 15 03:28:47 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>

14
shim.spec
View File

@ -83,6 +83,7 @@ BuildRequires: openssl >= 0.9.8
BuildRequires: pesign
BuildRequires: pesign-obs-integration
%if 0%{?suse_version} > 1320
BuildRequires: fde-tpm-helper-rpm-macros
BuildRequires: update-bootloader-rpm-macros
%endif
%if 0%{?update_bootloader_requires:1}
@ -90,9 +91,13 @@ BuildRequires: update-bootloader-rpm-macros
%else
Requires: perl-Bootloader
%endif
%if 0%{?fde_tpm_update_requires:1}
%fde_tpm_update_requires
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# For shim-install script
Requires: grub2-%{grubplatform}
# For shim-install script grub is needed but we also want to use
# shim for systemd-boot where shim-install is not actually used.
# Requires: grub2-%{grubplatform}
Requires: mokutil
ExclusiveArch: x86_64 aarch64
@ -286,6 +291,10 @@ cp -r source/* %{buildroot}/usr/src/debug/%{name}-%{version}
%{?buildroot:%__rm -rf "%{buildroot}"}
%post
%if 0%{?fde_tpm_update_post:1}
%fde_tpm_update_post shim
%endif
%if 0%{?update_bootloader_check_type_reinit_post:1}
%update_bootloader_check_type_reinit_post grub2-efi
%else
@ -316,6 +325,7 @@ fi
%if %{defined update_bootloader_posttrans}
%posttrans
%{?update_bootloader_posttrans}
%{?fde_tpm_update_posttrans}
%endif
%files