Fix for leapp / image mode ffffffff

When manipulating grubby entries with machine-id, if using an image
with improper BLS entry starting with ffffffff, grubby ends up not
touching anything, so fix by falling back to old behavior if nothing
matches machine-id.

Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
This commit is contained in:
Marta Lewandowska 2026-07-23 11:15:02 +02:00
parent 48cc248322
commit 773848500e
2 changed files with 16 additions and 1 deletions

View File

@ -94,6 +94,17 @@ get_bls_values() {
echo "${bls}"
done | /usr/libexec/grubby/rpm-sort -c rpmnvrcmp 2>/dev/null | tac)) || :
if [[ -z ${files} ]]; then
files=($(for bls in ${blsdir}/*.conf ; do
if ! [[ -e "${bls}" ]] ; then
continue
fi
bls="${bls%.conf}"
bls="${bls##*/}"
echo "${bls}"
done | /usr/libexec/grubby/rpm-sort -c rpmnvrcmp 2>/dev/null | tac)) || :
fi
for bls in "${files[@]}" ; do
blspath="${blsdir}/${bls}.conf"
bls_file[$count]="${blspath}"

View File

@ -1,6 +1,6 @@
Name: grubby
Version: 8.40
Release: 50%{?dist}
Release: 51%{?dist}
Summary: Command line tool for updating BootLoaderSpec files
License: GPLv2+
URL: https://github.com/rhinstaller/grubby
@ -169,6 +169,10 @@ current boot environment.
%{_mandir}/man8/*.8*
%changelog
* Thu Jul 23 2026 Marta Lewandowska <mlewando@redhat.com> - 8.40-51
- Have grubby only manipulate relevant entries, fallback if empty
- Resolves: #RHEL-132931
* Fri Jul 03 2026 Marta Lewandowska <mlewando@redhat.com> - 8.40-50
- Have grubby only manipulate and display relevant entries
- Resolves: #RHEL-132931