From 2c9128a9715ed012cdea9e2d7cf21d250574bbe6 Mon Sep 17 00:00:00 2001 From: Xunlei Pang Date: Wed, 30 Aug 2017 16:45:41 +0800 Subject: [PATCH] Revert "mkdumprd: omit dracut modules in case of network dumping" This reverts commit fb522e972c9d26e2efdabeaed543b5b23e1866e0. 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. Signed-off-by: Xunlei Pang Acked-by: Dave Young --- mkdumprd | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/mkdumprd b/mkdumprd index d3ecbd6..68fe6e8 100644 --- a/mkdumprd +++ b/mkdumprd @@ -372,13 +372,12 @@ crypt_exists=0 omit_dracut_modules() { local target majmin - local dm_exists network_only + local dm_exists # Skip fadump case is_fadump_capable && return dm_exists=0 - network_only=1 for target in $(get_kdump_targets); do if [ -b "$target" ]; then @@ -386,9 +385,6 @@ omit_dracut_modules() # Check "dm" check_block_and_slaves is_dm $majmin && dm_exists=1 fi - - # Check nfs/ssh dumping - [[ "$target" != "nfs" && "$target" != "ssh" ]] && network_only=0 done # Omit "crypt", BZ1451717 @@ -401,12 +397,6 @@ omit_dracut_modules() # "dm_exists=0" implies "crypt_exists=0" add_dracut_arg "--omit" "lvm dm multipath dmraid" fi - - # Further omit more modules in case of nfs/ssh dumping - if [ "$network_only" == "1" ]; then - # "network_only=1" implies "dm_exists=0" - add_dracut_arg "--omit" "iscsi fcoe fcoe-uefi" - fi } if ! check_resettable; then