3:45 a.m.
This reverts commit 54a5bcc4ee86f8647fbe4c3766910fb28add5cac.
We are going to add "--no-hostonly-default-device" dracut argument
in the following patch.
With the help of "--no-hostonly-default-device", dracut only
adds the dump target as host devices, which naturally guarantees
only required dracut modules being selected.
---
kdump-lib.sh | 12 ------------
kdumpctl | 12 ++++++++++++
mkdumprd | 15 ---------------
3 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/kdump-lib.sh b/kdump-lib.sh
index 3f0af91..a33f172 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -6,7 +6,6 @@
DEFAULT_PATH="/var/crash/"
FENCE_KDUMP_CONFIG_FILE="/etc/sysconfig/fence_kdump"
FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send"
-FADUMP_ENABLED_SYS_NODE="/sys/kernel/fadump_enabled"
perror_exit() {
echo $@ >&2
@@ -482,14 +481,3 @@ get_dracut_args_target()
{
echo $1 | grep "\-\-mount" | sed "s/.*--mount .\(.*\)/\1/" | cut
-d' ' -f1
}
-
-is_fadump_capable()
-{
- # Check if firmware-assisted dump is enabled
- # if no, fallback to kdump check
- if [ -f $FADUMP_ENABLED_SYS_NODE ]; then
- rc=`cat $FADUMP_ENABLED_SYS_NODE`
- [ $rc -eq 1 ] && return 0
- fi
- return 1
-}
diff --git a/kdumpctl b/kdumpctl
index 2ad786c..fba6231 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -13,6 +13,7 @@ DUMP_TARGET=""
DEFAULT_INITRD=""
DEFAULT_INITRD_BAK=""
TARGET_INITRD=""
+FADUMP_ENABLED_SYS_NODE="/sys/kernel/fadump_enabled"
FADUMP_REGISTER_SYS_NODE="/sys/kernel/fadump_registered"
#kdump shall be the default dump mode
DEFAULT_DUMP_MODE="kdump"
@@ -942,6 +943,17 @@ handle_mode_switch()
fi
}
+is_fadump_capable()
+{
+ # Check if firmware-assisted dump is enabled
+ # if no, fallback to kdump check
+ if [ -f $FADUMP_ENABLED_SYS_NODE ]; then
+ rc=`cat $FADUMP_ENABLED_SYS_NODE`
+ [ $rc -eq 1 ] && return 0
+ fi
+ return 1
+}
+
check_current_fadump_status()
{
# Check if firmware-assisted dump has been registered.
diff --git a/mkdumprd b/mkdumprd
index 8a2fe74..9f375e0 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -359,24 +359,11 @@ check_crypt()
return 1
}
-crypt_exists=0
-omit_dracut_modules()
-{
- # Skip fadump case
- is_fadump_capable && return
-
- # Omit "crypt", BZ1451717
- if [ "$crypt_exists" == "0" ]; then
- add_dracut_arg "--omit" "crypt"
- fi
-}
-
if ! check_resettable; then
exit 1
fi
if ! check_crypt; then
- crypt_exists=1
echo "Warning: Encrypted device is in dump path. User will prompted for password
during second kernel boot."
fi
@@ -461,8 +448,6 @@ then
add_dracut_arg "--add-drivers" "$extra_modules"
fi
-omit_dracut_modules
-
dracut "${dracut_args[@]}" "$@"
_rc=$?
sync
--
1.8.3.1