059687882c
- add os-prober-skip-part-on-multipath.patch
* fix os-prober creates many unusuable entries on multipath disk
(bnc#875327)
OBS-URL: https://build.opensuse.org/request/show/235735
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=39
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
Index: os-prober-1.61/os-prober
|
|
===================================================================
|
|
--- os-prober-1.61.orig/os-prober
|
|
+++ os-prober-1.61/os-prober
|
|
@@ -24,6 +24,29 @@ on_sataraid () {
|
|
return 1
|
|
}
|
|
|
|
+mp_disks="UNDEF"
|
|
+on_multipath () {
|
|
+ type multipath >/dev/null 2>&1 || return 1
|
|
+ local parent="${1%/*}"
|
|
+ local device="${parent##*/}"
|
|
+
|
|
+ if [ "$mp_disks" = "UNDEF" ]; then
|
|
+ mp_disks=`multipath -d -l | sed -n -e 's/^.\+[0-9]\+:[0-9]\+:[0-9]\+:[0-9]\+ \([^ ]\+\) .*/\1/p'`
|
|
+ fi
|
|
+
|
|
+ if [ -z "$mp_disks" ]; then
|
|
+ return 1
|
|
+ fi
|
|
+
|
|
+ for i in $mp_disks; do
|
|
+ if [ "$device" = "$i" ]; then
|
|
+ debug "$1: part of multipath disk $i"
|
|
+ return 0
|
|
+ fi
|
|
+ done
|
|
+ return 1
|
|
+}
|
|
+
|
|
partitions () {
|
|
# Exclude partitions that have whole_disk sysfs attribute set.
|
|
if [ -d /sys/block ]; then
|
|
@@ -31,7 +54,7 @@ partitions () {
|
|
# Serial ATA RAID disk.
|
|
for part in /sys/block/*/*[0-9]; do
|
|
if [ -f "$part/start" ] && \
|
|
- [ ! -f "$part/whole_disk" ] && ! on_sataraid $part; then
|
|
+ [ ! -f "$part/whole_disk" ] && ! on_sataraid $part && ! on_multipath $part; then
|
|
name="$(echo "${part##*/}" | sed 's,[!.],/,g')"
|
|
if [ -e "/dev/$name" ]; then
|
|
echo "/dev/$name"
|