Skip to content
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.

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

fix(dracut-functions.sh): only return block devices from get_persistent_dev (SLFO) #361

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Loading