48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
|
From 5f1d411c6c6a2118e368e649f3212a0a6e3b9680 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Philipp Rudo <prudo@redhat.com>
|
||
|
|
Date: Tue, 13 Aug 2024 16:38:40 +0200
|
||
|
|
Subject: [PATCH 12/16] mkdumprd: drop extra_modules variable
|
||
|
|
|
||
|
|
Add the drivers directly and drop the extra_modules variable.
|
||
|
|
|
||
|
|
Signed-off-by: Philipp Rudo <prudo@redhat.com>
|
||
|
|
---
|
||
|
|
mkdumprd | 7 +------
|
||
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mkdumprd b/mkdumprd
|
||
|
|
index 196f3f8..e01682d 100644
|
||
|
|
--- a/mkdumprd
|
||
|
|
+++ b/mkdumprd
|
||
|
|
@@ -28,7 +28,6 @@ fi
|
||
|
|
SSH_KEY_LOCATION=$DEFAULT_SSHKEY
|
||
|
|
SAVE_PATH=$(get_save_path)
|
||
|
|
|
||
|
|
-extra_modules=""
|
||
|
|
declare -a dracut_args
|
||
|
|
dracut_args+=(--add kdumpbase)
|
||
|
|
dracut_args+=(--quiet)
|
||
|
|
@@ -328,7 +327,7 @@ while read -r config_opt config_val; do
|
||
|
|
# remove inline comments after the end of a directive.
|
||
|
|
case "$config_opt" in
|
||
|
|
extra_modules)
|
||
|
|
- extra_modules="$extra_modules $config_val"
|
||
|
|
+ dracut_args+=(--add-drivers "$config_val")
|
||
|
|
;;
|
||
|
|
ext[234] | xfs | btrfs | minix | nfs | virtiofs)
|
||
|
|
check_user_configured_target "$config_val" "$config_opt"
|
||
|
|
@@ -387,10 +386,6 @@ if ! have_compression_in_dracut_args; then
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
|
||
|
|
-if [[ -n $extra_modules ]]; then
|
||
|
|
- dracut_args+=("--add-drivers" "$extra_modules")
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
# TODO: The below check is not needed anymore with the introduction of
|
||
|
|
# 'zz-fadumpinit' module, that isolates fadump's capture kernel initrd,
|
||
|
|
# but still sysroot.mount unit gets generated based on 'root=' kernel
|
||
|
|
--
|
||
|
|
2.46.1
|
||
|
|
|