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

dracut-057-86.git20250217

Browse Source 
Resolves: RHEL-53364,RHEL-57094,RHEL-64754,RHEL-65249,RHEL-79815
This commit is contained in:
Pavel Valena 2025-02-17 23:26:39 +01:00
parent f8e78fc034
commit 53f49f958c
8 changed files with 1292 additions and 1 deletions

34
0079.patch Normal file
View File

@ -0,0 +1,34 @@
From a5b07e49259b201374124ba1e23b931da6e741e0 Mon Sep 17 00:00:00 2001
From: packit-public-repos-bot
<125959684+packit-public-repos-bot@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:47:15 +0100
Subject: [PATCH] Fix configuration for Packit 1.0.0
This commit fixes the configuration for the forthcoming Packit 1.0.0.
See [our blog post](https://packit.dev/posts/packit_1_0_0_action_required) for more details.
- Job type `build` has been changed to `copr_build`.
- Job type `production_build` has been changed to `upstream_koji_build`.
- Key `upstream_project_name` has been changed to `upstream_package_name`.
- Key `synced_files` has been changed to `files_to_sync`.
Please review and merge me before January 2025 otherwise packit-service jobs will fail because of an invalid configuration.
Resolves: RHEL-65249
---
.packit.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.packit.yml b/.packit.yml
index 86ba83d2..1439a44e 100644
--- a/.packit.yml
+++ b/.packit.yml
@@ -7,7 +7,7 @@
# Docs: https://packit.dev/docs/
specfile_path: pkgbuild/dracut.spec
-synced_files:
+files_to_sync:
- .packit.yaml
upstream_package_name: dracut
downstream_package_name: dracut

24
0080.patch Normal file
View File

@ -0,0 +1,24 @@
From 78f56fa46b05409fb49f9c5ba776783aabb89d15 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Thu, 30 Jan 2025 12:43:01 +0100
Subject: [PATCH] test: fix url for btrfs-progs
Resolves: RHEL-65249
---
test/container/Dockerfile-CentOS-9-Stream | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/container/Dockerfile-CentOS-9-Stream b/test/container/Dockerfile-CentOS-9-Stream
index 26d308d2..3f0cdf6c 100644
--- a/test/container/Dockerfile-CentOS-9-Stream
+++ b/test/container/Dockerfile-CentOS-9-Stream
@@ -11,7 +11,7 @@ RUN echo 'export DRACUT_NO_XATTR=1 KVERSION=$(cd /lib/modules; ls -1 | tail -1)'
# FIXME: add dmraid, scsi-target-utils (e.g. from COPR)
RUN dnf -y install --enablerepo crb --setopt=install_weak_deps=False \
https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/d/dash-0.5.11.5-4.el9.x86_64.rpm \
- https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/b/btrfs-progs-6.10-1.el9.x86_64.rpm \
+ https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/b/btrfs-progs-6.12-3.el9.x86_64.rpm \
qemu-kvm \
NetworkManager \
asciidoc \

32
0081.patch Normal file
View File

@ -0,0 +1,32 @@
From 4c327d4d5f3dd08bce7a704e2e4e45e2a838dc93 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Mon, 17 Feb 2025 02:50:26 +0100
Subject: [PATCH] fix(35network-manager): remove duplicate installkernel
function
Issue introduced in commit: 0a264651d148b543c0c5d6b0a07909cdcb1abfba
Resolves: RHEL-64754
rhel-only
---
modules.d/35network-manager/module-setup.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/modules.d/35network-manager/module-setup.sh b/modules.d/35network-manager/module-setup.sh
index 4fd3d051..80ca21bd 100755
--- a/modules.d/35network-manager/module-setup.sh
+++ b/modules.d/35network-manager/module-setup.sh
@@ -14,11 +14,6 @@ depends() {
return 0
}
-# called by dracut
-installkernel() {
- return 0
-}
-
# called by dracut
installkernel() {
instmods nf_tables nfnetlink nft_fwd_netdev

28
0082.patch Normal file
View File

@ -0,0 +1,28 @@
From 31a612d5a1cc8c2f0fcc7db82a6f8c9106c8bb63 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Mon, 17 Feb 2025 09:15:11 +0100
Subject: [PATCH] ci: bump actions/upload-artifact version to v4
as v3 is deprecated.
https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/
rhel-only
---
.github/workflows/gather-metadata.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/gather-metadata.yml b/.github/workflows/gather-metadata.yml
index e4cbc486..d11c90d1 100644
--- a/.github/workflows/gather-metadata.yml
+++ b/.github/workflows/gather-metadata.yml
@@ -22,7 +22,7 @@ jobs:
uses: redhat-plumbers-in-action/gather-pull-request-metadata@v1
- name: Upload artifact with gathered metadata
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: pr-metadata
path: ${{ steps.Metadata.outputs.metadata-file }}

26
0083.patch Normal file
View File

@ -0,0 +1,26 @@
From 379b1eafcfb6b4e34b6689bc8f8eab5ecb27aac7 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-53364
---
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 a090bc88..91bbe785 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

51
0084.patch Normal file
View File

@ -0,0 +1,51 @@
From acbb003a63809ed870598eee7171a5c188e80113 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 24 Aug 2022 19:16:26 +0000
Subject: [PATCH] fix(dracut.sh): make omit-drivers option do exact match for
names
Modify the basic test case to use --omit-drivers and make it fail
without the PR and make it pass with the PR.
The test would fail with the following error without the PR:
FATAL: iscsiroot requested but kernel/initrd does not support iscsi
(cherry picked from commit a7f5cdbccbbd4d8c406ea7c4b3e6f25cd747e648)
Resolves: RHEL-57094
---
dracut.sh | 2 +-
test/TEST-01-BASIC/test.sh | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dracut.sh b/dracut.sh
index f748a073..dcdeaf5f 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1379,7 +1379,7 @@ omit_drivers_corrected=""
for d in $omit_drivers; do
[[ " $drivers $add_drivers " == *\ $d\ * ]] && continue
[[ " $drivers $force_drivers " == *\ $d\ * ]] && continue
- omit_drivers_corrected+="$d|"
+ omit_drivers_corrected+="^$d$|"
done
omit_drivers="${omit_drivers_corrected%|}"
unset omit_drivers_corrected
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 9f98af2c..877f6534 100755
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -110,9 +110,12 @@ test_setup() {
inst_hook shutdown-emergency 000 ./hard-off.sh
inst_hook emergency 000 ./hard-off.sh
)
+
+ # make sure --omit-drivers does not filter out drivers using regexp to test for an earlier regression (assuming there is no one letter linux kernel module needed to run the test)
"$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
-a "debug watchdog" \
-d "piix ide-gd_mod ata_piix ext3 sd_mod i6300esb ib700wdt" \
+ --omit-drivers 'a b c d e f g h i j k l m n o p q r s t u v w x y z' \
--no-hostonly-cmdline -N \
-f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
}

1079
0085.patch Normal file
View File

File diff suppressed because it is too large Load Diff

19
dracut.spec
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 79.git20241127
%define dist_free_release 86.git20250217
Name: dracut
Version: 057
@ -107,6 +107,13 @@ Patch75: 0075.patch
Patch76: 0076.patch
Patch77: 0077.patch
Patch78: 0078.patch
Patch79: 0079.patch
Patch80: 0080.patch
Patch81: 0081.patch
Patch82: 0082.patch
Patch83: 0083.patch
Patch84: 0084.patch
Patch85: 0085.patch
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
@ -118,6 +125,7 @@ BuildRequires: gcc
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: pkgconfig
BuildRequires: systemd
BuildRequires: openssl-devel
%endif
%if 0%{?fedora}
BuildRequires: bash-completion
@ -356,6 +364,8 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
%{dracutlibdir}/dracut-initramfs-restore
%{dracutlibdir}/dracut-install
%{dracutlibdir}/dracut-util
%{dracutlibdir}/ossl-config
%{dracutlibdir}/ossl-files
%{dracutlibdir}/skipcpio
%config(noreplace) %{_sysconfdir}/dracut.conf
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
@ -481,6 +491,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
%{dracutlibdir}/modules.d/99base
%{dracutlibdir}/modules.d/99memstrack
%{dracutlibdir}/modules.d/99fs-lib
%{dracutlibdir}/modules.d/99openssl
%{dracutlibdir}/modules.d/99shutdown
%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
%dir %{_sharedstatedir}/initramfs
@ -559,6 +570,12 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
%changelog
* Mon Feb 17 2025 Pavel Valena <pvalena@redhat.com> - 057-86.git20250217
- fix(35network-manager): remove duplicate installkernel
- feat(fips): include fips module unconditionally
- fix(dracut.sh): make omit-drivers option do exact match for
- feat: add openssl module
* Wed Nov 27 2024 Pavel Valena <pvalena@redhat.com> - 057-79.git20241127
- fix(35network-manager): install nftables kernel modules
- fix(35network-manager): install nft binary during module