depend() in module-setup.sh is a better place to setup dracut module
dependency, it will do early check, and fail early if needed module is
missing. Also remove a unneeded helper add_dracut_module.
Also remove the unnecessary return in depend() function.
Signed-off-by: Kairui Song <kasong(a)redhat.com>
---
dracut-module-setup.sh | 9 ++++++++-
mkdumprd | 9 ---------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index a186570..e68ad1b 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -36,6 +36,14 @@ depends() {
dwarning "Required modules to build a squashed kdump image is
missing!"
fi
+ if is_ssh_dump_target; then
+ _dep="$_dep ssh-client"
+ fi
+
+ if [ "$(uname -m)" = "s390x" ]; then
+ _dep="$_dep znet"
+ fi
+
if [ -n "$( find /sys/devices -name drm )" ] || [ -d /sys/module/hyperv_fb
]; then
_dep="$_dep drm"
fi
@@ -45,7 +53,6 @@ depends() {
fi
echo $_dep
- return 0
}
kdump_is_bridge() {
diff --git a/mkdumprd b/mkdumprd
index 3ea1d19..dfc8694 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -51,10 +51,6 @@ add_dracut_arg() {
dracut_args="$dracut_args $@"
}
-add_dracut_module() {
- add_dracut_arg "--add" "\"$1\""
-}
-
add_dracut_mount() {
add_dracut_arg "--mount" "\"$1\""
}
@@ -410,10 +406,6 @@ if [ -f "$keyfile" ]; then
SSH_KEY_LOCATION=$(/usr/bin/readlink -m $keyfile)
fi
-if [ "$(uname -m)" = "s390x" ]; then
- add_dracut_module "znet"
-fi
-
if is_wdt_addition_needed; then
add_dracut_arg "-a" "watchdog"
fi
@@ -446,7 +438,6 @@ do
then
mkdir_save_path_ssh $config_val
check_size ssh $config_val
- add_dracut_module "ssh-client"
add_dracut_sshkey "$SSH_KEY_LOCATION"
else
perror_exit "Bad ssh dump target $config_val"
--
2.28.0