43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
|
From 821ffb39cd0c3003b2711d30302b713ab9b5da9b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabian Vogt <fvogt@suse.de>
|
||
|
|
Date: Mon, 5 Aug 2024 11:28:32 +0200
|
||
|
|
Subject: [PATCH 12/24] fix(dracut-functions.sh): only return block devices
|
||
|
|
from get_persistent_dev
|
||
|
|
|
||
|
|
With udev 256, there are now directories such as
|
||
|
|
/dev/disk/by-path/pci-0000:02:00.0-nvme-1-part/ which match here.
|
||
|
|
|
||
|
|
In case a nonexisting file/device was passed to get_persistent_dev, it
|
||
|
|
returned the first directory it looked at because both have maj:min 0:0.
|
||
|
|
This accidental conversion from garbage to a sensible looking path leads
|
||
|
|
to weird behaviour later.
|
||
|
|
|
||
|
|
Instead of filtering out directories explicitly switch the check to only
|
||
|
|
return block devices, which also takes care of the character special
|
||
|
|
/dev/mapper/control.
|
||
|
|
|
||
|
|
(cherry picked from commit 55d2fb5b459f356fdbde60ddefb97be942a0c141)
|
||
|
|
|
||
|
|
Resolves: RHEL-49744
|
||
|
|
---
|
||
|
|
dracut-functions.sh | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||
|
|
index c8cb2e15..43d905e3 100755
|
||
|
|
--- a/dracut-functions.sh
|
||
|
|
+++ b/dracut-functions.sh
|
||
|
|
@@ -294,8 +294,7 @@ get_persistent_dev() {
|
||
|
|
/dev/disk/by-partlabel/* \
|
||
|
|
/dev/disk/by-id/* \
|
||
|
|
/dev/disk/by-path/*; do
|
||
|
|
- [[ -e $i ]] || continue
|
||
|
|
- [[ $i == /dev/mapper/control ]] && continue
|
||
|
|
+ [[ -b $i ]] || continue
|
||
|
|
[[ $i == /dev/mapper/mpath* ]] && continue
|
||
|
|
_tmp=$(get_maj_min "$i")
|
||
|
|
if [ "$_tmp" = "$_dev" ]; then
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|