Skip to content

Commit

Permalink
Merge pull request #361 from aafeijoo-suse/SLFO_Main-by-path-dirs-sys…
Browse files Browse the repository at this point in the history
…temd-v256-fix

fix(dracut-functions.sh): only return block devices from get_persistent_dev (SLFO)
  • Loading branch information
aafeijoo-suse authored Aug 9, 2024
2 parents f798f91 + ed55eca commit e9a253e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions dracut-functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,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
Expand Down
4 changes: 3 additions & 1 deletion suse/README.susemaint
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ branch. Currently, these active maintenance branches are:
- SUSE/049 -> SLE 15 SP2, SLE 15 SP3
- SUSE/055 -> SLE 15 SP4
- SLE-15-SP5_Update -> SLE 15 SP5 (based on SUSE/055 plus some specific patches)
- SLE-15-SP6_Update -> SLE 15 SP6
- SL-Micro-6.0_Update -> SL Micro 6.0
- SLFO_Main -> SUSE Linux Framework One
- SUSE/059 -> Tumbleweed

Rules:
Expand Down Expand Up @@ -358,4 +360,4 @@ b5a35f9d feat(zfcp_rules): remove zfcp handling consolidated in s390-tools
457e66e6 feat(ifcfg): minimize s390-specific network configuration aspects
3fd43858 fix(mdraid): try to assemble the missing raid device
61ab3386 feat(crypt): force the inclusion of crypttab entries with x-initrd.attach

6611c6e4 fix(dracut-functions.sh): only return block devices from get_persistent_dev

0 comments on commit e9a253e

Please sign in to comment.