6d2b6c96ec
Fixes: - fix(systemd-udevd): handle root=gpt-auto for systemd-v258 - fix(systemd-repart): allow partition format - feat(install.d): do not remove UKIs on remove) - fix(dracut.install): remove extraneous quotes in dracut arguments - feat(i18n): pull 'drm' or 'simpledrm' module unless excluded Additional changes: - remove redundant patch for test/container - include previously omitted test changes - patch renames because they're imported from source-git Resolves: RHEL-111580,RHEL-111709,RHEL-113071,RHEL-119787,RHEL-132571 From-source-git-commit: 3048090e3ff7e9747936dd18e4557a4f1ebabdd6
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 575585575b6309fc3563e58856d6c8f54df0f4a1 Mon Sep 17 00:00:00 2001
|
|
From: Tomas Bzatek <tbzatek@redhat.com>
|
|
Date: Tue, 24 Jun 2025 16:50:31 +0200
|
|
Subject: [PATCH 24/31] fix(74nvmf): set root=nvmf
|
|
|
|
In a restricted image like kdump the kernel commandline argument root=
|
|
is typically absent. However it is required by the 45net-lib/netroot.sh
|
|
module that fails with:
|
|
|
|
[ 23.599862] dracut: FATAL: No or empty root= argument
|
|
[ 23.604956] dracut: Refusing to continue
|
|
|
|
Inspired by the 74iscsi module, let's set it to root=nvmf if not set
|
|
before.
|
|
|
|
Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
|
|
(cherry picked from commit a6dce328ea9738a558db848fa8dbed253b15ee3d)
|
|
|
|
Resolves: RHEL-104223
|
|
---
|
|
modules.d/95nvmf/parse-nvmf-boot-connections.sh | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/modules.d/95nvmf/parse-nvmf-boot-connections.sh b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
|
|
index aad2a458..5288553f 100755
|
|
--- a/modules.d/95nvmf/parse-nvmf-boot-connections.sh
|
|
+++ b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
|
|
@@ -326,3 +326,7 @@ fi
|
|
|
|
/sbin/initqueue --settled --onetime --name nvmf-connect-settled /sbin/nvmf-autoconnect.sh settled
|
|
/sbin/initqueue --timeout --onetime --name nvmf-connect-timeout /sbin/nvmf-autoconnect.sh timeout
|
|
+
|
|
+# shellcheck disable=SC2034
|
|
+rootok=1
|
|
+[ -z "$root" ] && root="nvmf"
|
|
--
|
|
2.52.0
|
|
|