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

Remove is_dump_target_configured

Browse Source 
It's basically same with is_user_configured_dump_target and only have
one caller. And the name is confusing, the dump target is always
configured, it's either user configured or path based.

Signed-off-by: Kairui Song <kasong@redhat.com>
Acked-by: Lianbo Jiang <lijiang@redhat.com>
This commit is contained in:
Kairui Song 2020-03-05 15:34:06 +08:00
parent 3be5f74df0
commit c1c7f004c8
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kdumpctl
View File

@ -896,15 +896,6 @@ save_raw()
return 0 return 0
} }
is_dump_target_configured()
{
local _target
_target=$(egrep "^ext[234]|^xfs|^btrfs|^minix|^raw|^ssh|^nfs" /etc/kdump.conf)
[ -n "$_target" ]
}
local_fs_dump_target() local_fs_dump_target()
{ {
local _target local _target
@ -919,7 +910,11 @@ path_to_be_relabeled()
{ {
local _path _target _mnt="/" _rmnt local _path _target _mnt="/" _rmnt
if is_dump_target_configured; then if is_user_configured_dump_target; then
if is_mount_in_dracut_args; then
return;
fi
_target=$(local_fs_dump_target) _target=$(local_fs_dump_target)
if [[ -n "$_target" ]]; then if [[ -n "$_target" ]]; then
_mnt=$(findmnt -k -f -n -r -o TARGET $_target) _mnt=$(findmnt -k -f -n -r -o TARGET $_target)
@ -931,9 +926,6 @@ path_to_be_relabeled()
fi fi
fi fi
if is_mount_in_dracut_args; then
return;
fi
_path=$(get_save_path) _path=$(get_save_path)
# if $_path is masked by other mount, we will not relabel it. # if $_path is masked by other mount, we will not relabel it.
_rmnt=$(df $_mnt/$_path 2>/dev/null | tail -1 | awk '{ print $NF }') _rmnt=$(df $_mnt/$_path 2>/dev/null | tail -1 | awk '{ print $NF }')