import UBI dracut-049-237.git20250603.el8_10

This commit is contained in:
eabdullin 2025-07-15 07:52:51 +00:00
parent 50c720f020
commit 1a75b985ad
5 changed files with 119 additions and 1 deletions

23
SOURCES/0233.patch Normal file
View File

@ -0,0 +1,23 @@
From 3fff129472d353a189a8f0c7bc768534e4c09d16 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Wed, 7 May 2025 17:54:41 +0200
Subject: [PATCH] ci: fix differential shellcheck
---
.github/workflows/differential-shellcheck.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/differential-shellcheck.yml b/.github/workflows/differential-shellcheck.yml
index 55273b3d..098bd8f7 100644
--- a/.github/workflows/differential-shellcheck.yml
+++ b/.github/workflows/differential-shellcheck.yml
@@ -5,7 +5,7 @@ on:
jobs:
test:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
steps:
- name: Repository checkout

26
SOURCES/0234.patch Normal file
View File

@ -0,0 +1,26 @@
From b61af7e8c89d2b9625fd7e6285168231c0cf2d03 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Mon, 19 Aug 2024 09:41:27 +0200
Subject: [PATCH] feat(fips): include fips module unconditionally
rhel-only
Resolves: RHEL-53355
---
modules.d/01fips/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
index 71bea53a..66eac19f 100755
--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
@@ -2,7 +2,7 @@
# called by dracut
check() {
- return 255
+ return 0
}
# called by dracut

33
SOURCES/0235.patch Normal file
View File

@ -0,0 +1,33 @@
From 4cbaead393233e6967bd804d57cbd0d73b992431 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Thu, 6 Mar 2025 14:30:26 +0100
Subject: [PATCH] fix(rescue): create hmac file for rescue kernel
Resolves: RHEL-53364
---
51-dracut-rescue.install | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/51-dracut-rescue.install b/51-dracut-rescue.install
index 47eb8e7d..e50468dd 100755
--- a/51-dracut-rescue.install
+++ b/51-dracut-rescue.install
@@ -89,6 +89,17 @@ case "$COMMAND" in
echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/$KERNEL'!" >&2
fi
+ HMAC=".${KERNEL}.hmac"
+
+ KERNEL_DIR="${KERNEL_IMAGE%/*}"
+ KERNEL_FILE="${KERNEL_IMAGE##*/}"
+
+ HMAC_FILE="${KERNEL_DIR}/.${KERNEL_FILE}.hmac"
+
+ if ! sed -E "s/([0-9a-f]+)(\s+).*$/\1\2${KERNEL}/" "$HMAC_FILE" > "$BOOT_DIR_ABS/$HMAC"; then
+ echo "Can't create '$BOOT_DIR_ABS/$HMAC' from '$HMAC_FILE'!" >&2
+ fi
+
if [[ ! -f "$BOOT_DIR_ABS/$INITRD" ]]; then
dracut -f --no-hostonly -a "rescue" "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
((ret+=$?))

24
SOURCES/0236.patch Normal file
View File

@ -0,0 +1,24 @@
From c81062cf34a1a652d68b45fc876d93a4ed5c9ada Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Sun, 28 Jan 2024 18:06:15 +0100
Subject: [PATCH] fix(spec): own 50-network-legacy.conf
Without %config, to have the file removed with the package as well.
Resolves: RHEL-5673
---
dracut.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/dracut.spec b/dracut.spec
index a417f780..5215985a 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -446,6 +446,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
%{dracutlibdir}/modules.d/95znet
%endif
%{dracutlibdir}/modules.d/99uefi-lib
+%attr(0644,root,root) %ghost %{_sysconfdir}/dracut.conf.d/50-network-legacy.conf
%files caps
%{dracutlibdir}/modules.d/02caps

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 233.git20240115
%define dist_free_release 237.git20250603
Name: dracut
Version: 049
@ -260,6 +260,10 @@ Patch229: 0229.patch
Patch230: 0230.patch
Patch231: 0231.patch
Patch232: 0232.patch
Patch233: 0233.patch
Patch234: 0234.patch
Patch235: 0235.patch
Patch236: 0236.patch
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
@ -679,6 +683,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
%{dracutlibdir}/modules.d/95znet
%endif
%{dracutlibdir}/modules.d/99uefi-lib
%attr(0644,root,root) %ghost %{_sysconfdir}/dracut.conf.d/50-network-legacy.conf
%files caps
%{dracutlibdir}/modules.d/02caps
@ -715,6 +720,13 @@ echo '# Since rhel-8.3 dracut moved to use NetworkManager
add_dracutmodules+=" network-legacy "' > /etc/dracut.conf.d/50-network-legacy.conf
%changelog
* Wed Jun 04 2025 Pavel Valena <pvalena@redhat.com> - 049-237.git20250603
- fix(rescue): create hmac file for rescue kernel
- fix(spec): drop %config from 50-network-legacy.conf
* Tue Apr 15 2025 Pavel Valena <pvalena@redhat.com> - 049-234.git20240115
- spec: own 50-network-legacy.conf
* Mon Jan 15 2024 Pavel Valena <pvalena@redhat.com> - 049-233.git20240115
- fix(dracut.sh): remove microcode check based on
- fix(qeth_rules): check the existence of