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

mkdumprd: do not lookup in by-uuid dirs for raw device's persistent name

Browse Source 
raw devices are not mounted and also does not need to contain any
filesystem. So they may have UUIDs(when formatted) and may not have UUIDs
when raw. Therefore, do not look for persistent names by-uuid for raw
devices.

Signed-off-by: Pratyush Anand <panand@redhat.com>
Suggested-by: Dave Young <dyoung@redhat.com>
Acked-by: Xunlei Pang <xlpang@redhat.com>
Acked-by: Baoquan He <xlpang@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
This commit is contained in:
Pratyush Anand 2016-05-09 13:47:51 +05:30 committed by Dave Young
parent 8d44a2853d
commit 87964860b6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mkdumprd
View File

@ -30,14 +30,20 @@ perror() {
} }
get_persistent_dev() { get_persistent_dev() {
local i _tmp _dev local i _tmp _dev _lookup_dirs
_dev=$(udevadm info --query=name --name="$1" 2>/dev/null) _dev=$(udevadm info --query=name --name="$1" 2>/dev/null)
[ -z "$_dev" ] && { [ -z "$_dev" ] && {
perror_exit "Kernel dev name of $1 is not found." perror_exit "Kernel dev name of $1 is not found."
} }
for i in /dev/mapper/* /dev/disk/by-uuid/* /dev/disk/by-id/*; do if [[ $2 = "raw" ]];then
_lookup_dirs="/dev/mapper/* /dev/disk/by-id/*"
else
_lookup_dirs="/dev/mapper/* /dev/disk/by-uuid/* /dev/disk/by-id/*"
fi
for i in $_lookup_dirs; do
_tmp=$(udevadm info --query=name --name="$i" 2>/dev/null) _tmp=$(udevadm info --query=name --name="$i" 2>/dev/null)
if [ "$_tmp" = "$_dev" ]; then if [ "$_tmp" = "$_dev" ]; then
echo $i echo $i
@ -138,7 +144,7 @@ to_mount() {
_mntopts="$_target $_fstype $_options" _mntopts="$_target $_fstype $_options"
#for non-nfs _dev converting to use udev persistent name #for non-nfs _dev converting to use udev persistent name
if [ -b "$_source" ]; then if [ -b "$_source" ]; then
_pdev="$(get_persistent_dev $_source)" _pdev="$(get_persistent_dev $_source $_fstype)"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
return 1 return 1
fi fi
@ -565,7 +571,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=$(get_persistent_dev $config_val) _praw=$(get_persistent_dev $config_val "raw")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi