Skip to content

perf(dracut-functions.sh): optimise get_persistent_dev() #2003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −14
Open

perf(dracut-functions.sh): optimise get_persistent_dev() #2003

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions dracut-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ get_devpath_block() {

# get a persistent path from a device
get_persistent_dev() {
local i _tmp _dev _pol
local _dev _pol

_dev=$(get_maj_min "$1")
_dev=$(stat -L -c $'%t:%T' "$1" 2> /dev/null)
[ -z "$_dev" ] && return

if [[ -n $persistent_policy ]]; then
Expand All @@ -279,25 +279,18 @@ get_persistent_dev() {
_pol=
fi

for i in \
# shellcheck disable=SC2086
printf '%s\0' \
$_pol \
/dev/mapper/* \
/dev/disk/by-uuid/* \
/dev/disk/by-label/* \
/dev/disk/by-partuuid/* \
/dev/disk/by-partlabel/* \
/dev/disk/by-id/* \
/dev/disk/by-path/*; do
[[ -e $i ]] || continue
[[ $i == /dev/mapper/control ]] && continue
[[ $i == /dev/mapper/mpath* ]] && continue
_tmp=$(get_maj_min "$i")
if [ "$_tmp" = "$_dev" ]; then
printf -- "%s" "$i"
return
fi
done
printf -- "%s" "$1"
/dev/disk/by-path/* \
| xargs -0 stat -L -c $'%n\t%t:%T' 2> /dev/null \
| awk -v_dev="$_dev" -vdfl="$1" '$0 ~ ("\t" _dev "$") {--NF; print; dfl=0; exit} END {if(dfl) print dfl}'
}

expand_persistent_dev() {
Expand Down