Relax restriction of dumping on encrypted target

Description:
Currently kdumpctl will fail to create kdump initramfs and start
kdump service while dump target is encrypted. This restriction is
too strict.

Resolution:
Just warn user that encrypted device is in dump path and second
kernel will wait on console for password to be entered.

Signed-off-by: arthur <zzou@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
arthur 2014-02-19 10:02:19 +08:00 committed by WANG Chao
parent 5dac95bbad
commit 906dc0bca0

View File

@ -467,7 +467,7 @@ is_crypt()
eval "$line" eval "$line"
[[ "$ID_FS_TYPE" = "crypto_LUKS" ]] && { [[ "$ID_FS_TYPE" = "crypto_LUKS" ]] && {
dev=$(udevadm info --query=all --path=/sys/dev/block/$majmin | awk -F= '/DEVNAME/{print $2}') dev=$(udevadm info --query=all --path=/sys/dev/block/$majmin | awk -F= '/DEVNAME/{print $2}')
perror "Device $dev is encrypted, can not be used in kdump." echo "Device $dev is encrypted."
return 0 return 0
} }
return 1 return 1
@ -482,18 +482,11 @@ check_crypt()
[ $_ret -eq 0 ] && return [ $_ret -eq 0 ] && return
if [ $_ret -eq 1 ]; then
_target=$(get_block_dump_target)
perror "Can not save vmcore to target device $_target."
elif [ $_ret -eq 2 ]; then
perror "Default action is dump_to_rootfs but can not save vmcore to root device."
fi
return 1 return 1
} }
if ! check_crypt; then if ! check_crypt; then
exit 1 echo "Warning: Encrypted device is in dump path. User will prompted for password during second kernel boot."
fi fi
# firstly get right SSH_KEY_LOCATION # firstly get right SSH_KEY_LOCATION