rpms/kexec-tools
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "mkdumprd: omit dracut modules in case of network dumping"

Browse Source 
This reverts commit fb522e972c.

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 <xlpang@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
This commit is contained in:
Xunlei Pang 2017-08-30 16:45:41 +08:00 committed by Dave Young
parent c8ab07e72b
commit 2c9128a971
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mkdumprd
View File

@ -372,13 +372,12 @@ crypt_exists=0
omit_dracut_modules() omit_dracut_modules()
{ {
local target majmin local target majmin
local dm_exists network_only local dm_exists
# Skip fadump case # Skip fadump case
is_fadump_capable && return is_fadump_capable && return
dm_exists=0 dm_exists=0
network_only=1
for target in $(get_kdump_targets); do for target in $(get_kdump_targets); do
if [ -b "$target" ]; then if [ -b "$target" ]; then
@ -386,9 +385,6 @@ omit_dracut_modules()
# Check "dm" # Check "dm"
check_block_and_slaves is_dm $majmin && dm_exists=1 check_block_and_slaves is_dm $majmin && dm_exists=1
fi fi
# Check nfs/ssh dumping
[[ "$target" != "nfs" && "$target" != "ssh" ]] && network_only=0
done done
# Omit "crypt", BZ1451717 # Omit "crypt", BZ1451717
@ -401,12 +397,6 @@ omit_dracut_modules()
# "dm_exists=0" implies "crypt_exists=0" # "dm_exists=0" implies "crypt_exists=0"
add_dracut_arg "--omit" "lvm dm multipath dmraid" add_dracut_arg "--omit" "lvm dm multipath dmraid"
fi 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 if ! check_resettable; then