Hello community,
here is the log from the commit of package os-prober for openSUSE:Factory
checked in at 2014-06-02 07:02:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
and /work/SRC/openSUSE:Factory/.os-prober.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober"
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2014-01-23
15:50:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-06-02
07:02:59.000000000 +0200
@@ -1,0 +2,7 @@
+Thu May 29 08:26:40 UTC 2014 - mch...@suse.com
+
+- add os-prober-skip-part-on-multipath.patch
+ * fix os-prober creates many unusuable entries on multipath disk
+ (bnc#875327)
+
+-------------------------------------------------------------------
New:
----
os-prober-skip-part-on-multipath.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-prober.spec ++++++
--- /var/tmp/diff_new_pack.ahtiWB/_old 2014-06-02 07:03:00.000000000 +0200
+++ /var/tmp/diff_new_pack.ahtiWB/_new 2014-06-02 07:03:00.000000000 +0200
@@ -51,6 +51,8 @@
Patch12: os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
# PATCH-FIX-OPENSUSE: fix os-prober entries for distro on btrfs root-fs not
created (bnc#846003)
Patch13: os-prober-fix-btrfs-subvol-mounted-tests.patch
+# PATCH-FIX-SLE: fix os-prober creates many unusuable entries on multipath
disk (bnc#875327)
+Patch14: os-prober-skip-part-on-multipath.patch
Requires: /bin/grep
Requires: /bin/sed
@@ -82,6 +84,7 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
%build
make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"
++++++ os-prober-skip-part-on-multipath.patch ++++++
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"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
