rpms/grub2
8
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-24 22:35:28 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Only try to generate a config if the ESP is mounted

Browse source 
The posttran scriptlet attempts to generate a GRUB configuration if there
isn't one in the EFI System Partition. But this leads to a failure if the
grub2 package is installed in a container.

To avoid this issue, only attempt to generate a GRUB config if the ESP is
mounted in /boot/efi.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2021-06-15 15:50:14 +02:00
parent add06f6b2b
commit 27273a8d31
No known key found for this signature in database
GPG key ID: C751E590D63F3D69
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
grub2.spec
View file

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 1%{?dist} Release: 2%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -81,6 +81,7 @@ hardware devices.\
Summary: grub2 common layout Summary: grub2 common layout
BuildArch: noarch BuildArch: noarch
Conflicts: grubby < 8.40-18 Conflicts: grubby < 8.40-18
Requires(post): util-linux
%description common %description common
This package provides some directories which are required by various grub2 This package provides some directories which are required by various grub2
@ -352,9 +353,15 @@ set -eu
EFI_HOME=%{efi_esp_dir} EFI_HOME=%{efi_esp_dir}
GRUB_HOME=/boot/grub2 GRUB_HOME=/boot/grub2
ESP_PATH=/boot/efi
if ! mountpoint -q ${ESP_PATH}; then
exit 0 # no ESP mounted, nothing to do
fi
if test ! -f ${EFI_HOME}/grub.cfg; then if test ! -f ${EFI_HOME}/grub.cfg; then
grub2-mkconfig -o ${EFI_HOME}/grub.cfg # there's no config in ESP, create one
grub2-mkconfig -o ${EFI_HOME}/grub.cfg
fi fi
if grep -q "configfile" ${EFI_HOME}/grub.cfg; then if grep -q "configfile" ${EFI_HOME}/grub.cfg; then
@ -555,6 +562,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Tue Jun 15 2021 Javier Martinez Canillas <javierm@redhat.com> - 2.06-2
- Only try to generate a config if the ESP is mounted
* Mon Jun 14 2021 Javier Martinez Canillas <javierm@redhat.com> - 2.06-1 * Mon Jun 14 2021 Javier Martinez Canillas <javierm@redhat.com> - 2.06-1
- Update to 2.06 final release and ton of fixes - Update to 2.06 final release and ton of fixes