2f63df8772
https://github.com/redhat-plumbers/dracut-rhel10/pull/30 And additonal fixes; respective commits: - fix(systemd-ask-password): do not half-install systemd-ask-password-wall - fix(pcsc): add libpcsclite_real.so.* Additional simple fixes. - revert: "fix(rescue): make rescue always no-hostonly" Do not use "add-confdir", as we do not package those configs. - fix(dracut-install): initize fts pointer Fix for compiler warning; https://github.com/dracut-ng/dracut-ng/pull/1229 - feat: add openssl module Needed for eDNS and fips. - build: make erofs the default requirement for squash subpackage Needed for squashfs removal. Resolves: RHEL-65204,RHEL-68935,RHEL-76323 From-source-git-commit: 9e216f2126a772e4b91b234c90d1debef797dced
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 430b1b06e60de78c28ed6e70982a30f41585b219 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Tue, 18 Jan 2022 18:58:58 +0100
|
|
Subject: [PATCH 03/13] fix(kernel-install): do not generate an initrd when one
|
|
was specified
|
|
|
|
According to the synopsis, kernel-install can be called with an
|
|
already-prepared initrd. In that case, no initrd should be generated by dracut.
|
|
|
|
(Cherry-picked commit 0b72cf5c4eca0e0db76e3e210cfdc48e6b49bb74 from PR#1825)
|
|
---
|
|
install.d/50-dracut.install | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
|
|
index 3f961b11..076b4f5e 100755
|
|
--- a/install.d/50-dracut.install
|
|
+++ b/install.d/50-dracut.install
|
|
@@ -4,6 +4,7 @@ COMMAND="$1"
|
|
KERNEL_VERSION="$2"
|
|
BOOT_DIR_ABS="$3"
|
|
KERNEL_IMAGE="$4"
|
|
+INITRD_OPTIONS_SHIFT=4
|
|
|
|
# If KERNEL_INSTALL_MACHINE_ID is defined but empty, BOOT_DIR_ABS is a fake directory.
|
|
# In this case, do not create the initrd.
|
|
@@ -60,6 +61,9 @@ ret=0
|
|
|
|
case "$COMMAND" in
|
|
add)
|
|
+ # If the initrd was provided on the kernel command line, we shouldn't generate our own.
|
|
+ [ "$#" -gt "$INITRD_OPTIONS_SHIFT" ] && exit 0
|
|
+
|
|
if [[ $IMAGE == "uki.efi" ]]; then
|
|
IMAGE_PREGENERATED=${KERNEL_IMAGE%/*}/uki.efi
|
|
else
|
|
--
|
|
2.47.1
|
|
|