Always wrap up call to dracut get_persistent_dev function
Dracut get_persistent_dev function don't recognize UUID= or LABEL= format, so caller should conver it to the path to the block device before calling it. There is already such a helper "kdump_get_persistent_dev", just move it to kdump-lib.sh and rename it to reuse it, Signed-off-by: Kairui Song <kasong@redhat.com> Acked-by: Dave Young <dyoung@redhat.com>
This commit is contained in:
parent
66ff48ed68
commit
a29de38da5
|
@ -48,20 +48,6 @@ depends() {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
kdump_get_persistent_dev() {
|
|
||||||
local dev="${1//\"/}"
|
|
||||||
|
|
||||||
case "$dev" in
|
|
||||||
UUID=*)
|
|
||||||
dev=`blkid -U "${dev#UUID=}"`
|
|
||||||
;;
|
|
||||||
LABEL=*)
|
|
||||||
dev=`blkid -L "${dev#LABEL=}"`
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
echo $(get_persistent_dev "$dev")
|
|
||||||
}
|
|
||||||
|
|
||||||
kdump_is_bridge() {
|
kdump_is_bridge() {
|
||||||
[ -d /sys/class/net/"$1"/bridge ]
|
[ -d /sys/class/net/"$1"/bridge ]
|
||||||
}
|
}
|
||||||
|
|
14
kdump-lib.sh
14
kdump-lib.sh
|
@ -307,6 +307,20 @@ get_option_value() {
|
||||||
strip_comments `grep "^$1[[:space:]]\+" /etc/kdump.conf | tail -1 | cut -d\ -f2-`
|
strip_comments `grep "^$1[[:space:]]\+" /etc/kdump.conf | tail -1 | cut -d\ -f2-`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kdump_get_persistent_dev() {
|
||||||
|
local dev="${1//\"/}"
|
||||||
|
|
||||||
|
case "$dev" in
|
||||||
|
UUID=*)
|
||||||
|
dev=`blkid -U "${dev#UUID=}"`
|
||||||
|
;;
|
||||||
|
LABEL=*)
|
||||||
|
dev=`blkid -L "${dev#LABEL=}"`
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
echo $(get_persistent_dev "$dev")
|
||||||
|
}
|
||||||
|
|
||||||
is_atomic()
|
is_atomic()
|
||||||
{
|
{
|
||||||
grep -q "ostree" /proc/cmdline
|
grep -q "ostree" /proc/cmdline
|
||||||
|
|
2
kdumpctl
2
kdumpctl
|
@ -482,7 +482,7 @@ check_dump_fs_modified()
|
||||||
if [[ $(expr substr $_new_fstype 1 3) = "nfs" ]];then
|
if [[ $(expr substr $_new_fstype 1 3) = "nfs" ]];then
|
||||||
_new_dev=$_target
|
_new_dev=$_target
|
||||||
else
|
else
|
||||||
_new_dev=$(get_persistent_dev $_target)
|
_new_dev=$(kdump_get_persistent_dev $_target)
|
||||||
if [ -z "$_new_dev" ]; then
|
if [ -z "$_new_dev" ]; then
|
||||||
echo "Get persistent device name failed"
|
echo "Get persistent device name failed"
|
||||||
return 2
|
return 2
|
||||||
|
|
4
mkdumprd
4
mkdumprd
|
@ -93,7 +93,7 @@ to_mount() {
|
||||||
_mntopts="$_new_mntpoint $_fstype $_options"
|
_mntopts="$_new_mntpoint $_fstype $_options"
|
||||||
# for non-nfs _target converting to use udev persistent name
|
# for non-nfs _target converting to use udev persistent name
|
||||||
if [ -b "$_target" ]; then
|
if [ -b "$_target" ]; then
|
||||||
_pdev="$(get_persistent_dev $_target)"
|
_pdev="$(kdump_get_persistent_dev $_target)"
|
||||||
if [ -z "$_pdev" ]; then
|
if [ -z "$_pdev" ]; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
@ -438,7 +438,7 @@ do
|
||||||
dd if=$config_val count=1 of=/dev/null > /dev/null 2>&1 || {
|
dd if=$config_val count=1 of=/dev/null > /dev/null 2>&1 || {
|
||||||
perror_exit "Bad raw disk $config_val"
|
perror_exit "Bad raw disk $config_val"
|
||||||
}
|
}
|
||||||
_praw=$(persistent_policy="by-id" get_persistent_dev $config_val)
|
_praw=$(persistent_policy="by-id" kdump_get_persistent_dev $config_val)
|
||||||
if [ -z "$_praw" ]; then
|
if [ -z "$_praw" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue