import dracut-049-202.git20220511.el8_6

This commit is contained in:
CentOS Sources 2022-06-28 06:55:02 -04:00 committed by root
parent 6e01645ab4
commit bcf92c509e
2 changed files with 38 additions and 1 deletions

33
SOURCES/0201.patch Normal file
View File

@ -0,0 +1,33 @@
From d7c2342fb26a52142ce1fb9b10b636565aba7780 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Mon, 2 May 2022 20:12:25 +0200
Subject: [PATCH] fix(fips): start iterating from 0 over BOOT_IMAGE entries
as the code contains a bug which sets default 0, but iterates from 1.
Correct approach is indexing from 0.
https://github.com/redhat-plumbers/dracut-rhel8/pull/9
---
modules.d/01fips/fips.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
index c57fd426..e8952489 100755
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -124,13 +124,13 @@ do_fips()
elif [ -d /boot/loader/entries ]; then
i=0
for bls in $(ls -d /boot/loader/entries/*.conf | sort -rV); do
- ((i++))
-
if [ $i -eq ${BOOT_IMAGE:-0} ] && [ -r "$bls" ]; then
BOOT_IMAGE="$(grep -e '^linux' "$bls" | grep -o ' .*$')"
BOOT_IMAGE=${BOOT_IMAGE:1}
break
fi
+
+ ((i++))
done
fi
fi

View File

@ -5,7 +5,7 @@
# strip the automatically generated dep here and instead co-own the
# directory.
%global __requires_exclude pkg-config
%define dist_free_release 201.git20220131
%define dist_free_release 202.git20220511
Name: dracut
Version: 049
@ -228,6 +228,7 @@ Patch197: 0197.patch
Patch198: 0198.patch
Patch199: 0199.patch
Patch200: 0200.patch
Patch201: 0201.patch
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
@ -680,6 +681,9 @@ echo '# Since rhel-8.3 dracut moved to use NetworkManager
add_dracutmodules+=" network-legacy "' > /etc/dracut.conf.d/50-network-legacy.conf
%changelog
* Wed May 11 2022 Pavel Valena <pvalena@redhat.com> - 049-202.git20220511
- fix(fips): start iterating from 0 over BOOT_IMAGE entries
* Mon Jan 31 2022 Pavel Valena <pvalena@redhat.com> - 049-201.git20220131
- ci: introduce C8S based GHA CI
- ci: backport TEST-21-NFS-NM