rpms/grubby
6
0
Fork 0
Code Issues Pull Requests Releases Activity

grubby-bls: in s390* systems, run zipl on grub cfg update event

Browse Source 
Change takes into account s390* systems as target for zipl execution. Reformat
better archs/scenarios when either zipl or grub2-mkconfig must be run.

Resolves: #RHEL-36092
Signed-off-by: Leo Sandoval <lsandova@redhat.com>
This commit is contained in:
Leo Sandoval 2025-03-20 10:19:48 -06:00
parent b16dacf88a
commit ec995a48f3
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
grubby-bls
View File

@ -595,17 +595,19 @@ remove_var_prefix() {
update_grubcfg() update_grubcfg()
{ {
# Turn on RUN_MKCONFIG on different archs/scenarios
if [[ "${arch}" = 's390' ]] || [[ "${arch}" = 's390x' ]]; then
# On s390/s390x systems, run mkconfig/zipl
RUN_MKCONFIG="true"
elif [[ "${arch}" = "ppc64le" ]] && [[ -d /sys/firmware/opal ]]; then
# Older ppc64le OPAL firmware don't have BLS support so grub2-mkconfig has to be run # Older ppc64le OPAL firmware don't have BLS support so grub2-mkconfig has to be run
# to generate a config with menuentry commands. # to generate a config with menuentry commands.
if [ "${arch}" = "ppc64le" ] && [ -d /sys/firmware/opal ]; then
RUN_MKCONFIG="true" RUN_MKCONFIG="true"
fi elif [[ -e /sys/hypervisor/type ]] && grep -q "^xen$" /sys/hypervisor/type; then
if [ ! -e /sys/hypervisor/guest_type ] || ! grep -q "^HVM$" /sys/hypervisor/guest_type; then
# PV and PVH Xen DomU guests boot with pygrub that doesn't have BLS support, # PV and PVH Xen DomU guests boot with pygrub that doesn't have BLS support,
# also Xen Dom0 use the menuentries from 20_linux_xen and not the ones from # also Xen Dom0 use the menuentries from 20_linux_xen and not the ones from
# 10_linux. So grub2-mkconfig has to run for both Xen Dom0 and DomU. # 10_linux. So grub2-mkconfig has to run for both Xen Dom0 and DomU.
if [[ -e /sys/hypervisor/type ]] && grep -q "^xen$" /sys/hypervisor/type; then
if [ ! -e /sys/hypervisor/guest_type ] || ! grep -q "^HVM$" /sys/hypervisor/guest_type; then
RUN_MKCONFIG=true RUN_MKCONFIG=true
fi fi
fi fi

7
grubby.spec
View File

@ -3,7 +3,7 @@
Name: grubby Name: grubby
Version: 8.40 Version: 8.40
Release: 80%{?dist} Release: 81%{?dist}
Summary: Command line tool for updating bootloader configs Summary: Command line tool for updating bootloader configs
License: GPL-2.0-or-later License: GPL-2.0-or-later
Source1: grubby-bls Source1: grubby-bls
@ -74,6 +74,11 @@ fi
%{_mandir}/man8/grubby.8* %{_mandir}/man8/grubby.8*
%changelog %changelog
* Thu Mar 20 2025 Leo Sandoval <lsandova@redhat.com> - 8.40-81
- grubby-bls: in s390* systems, run zipl on grub cfg update event
Fixes previous commit and formats better the conditions that trigger grub cfg updates
Resolves: #RHEL-36092
* Fri Dec 06 2024 Leo Sandoval <lsandova@redhat.com> - 8.40-80 * Fri Dec 06 2024 Leo Sandoval <lsandova@redhat.com> - 8.40-80
- grubby-bls: on PPC systems, remove petiboot's version checks - grubby-bls: on PPC systems, remove petiboot's version checks
Resolves: #RHEL-70194 Resolves: #RHEL-70194