From 2decebc005a84ec8e24bc5657eaec78a47924a8ab408702d98ebd24f39ebe394 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 17 Jan 2013 02:39:18 +0000
Subject: [PATCH] Accepting request 148750 from home:arvidjaar:bnc:798604

- add os-prober-1.49-skip-LVM2_member.patch (bnc#798604)
  * do not try to mount LVM2 PV

Bugzilla should be worked around by not using /etc/nothing in installation
system, but still this is bug in os-prober which is better fixed.

OBS-URL: https://build.opensuse.org/request/show/148750
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=13
---
 os-prober-1.49-skip-LVM2_member.patch | 14 ++++++++++++++
 os-prober.changes                     |  6 ++++++
 os-prober.spec                        |  3 +++
 3 files changed, 23 insertions(+)
 create mode 100644 os-prober-1.49-skip-LVM2_member.patch

diff --git a/os-prober-1.49-skip-LVM2_member.patch b/os-prober-1.49-skip-LVM2_member.patch
new file mode 100644
index 0000000..e945f5c
--- /dev/null
+++ b/os-prober-1.49-skip-LVM2_member.patch
@@ -0,0 +1,14 @@
+Index: os-prober/os-probes/common/50mounted-tests
+===================================================================
+--- os-prober.orig/os-probes/common/50mounted-tests
++++ os-prober/os-probes/common/50mounted-tests
+@@ -15,6 +15,9 @@ elif [ "$types" = swap ]; then
+ elif [ "$types" = crypto_LUKS ]; then
+ 	debug "$1 is a LUKS partition; skipping"
+ 	exit 0
++elif [ "$types" = LVM2_member ]; then
++	debug "$1 is a LVM2 partition; skipping"
++	exit 0
+ elif [ "$types" = ntfs ]; then
+ 	if type ntfs-3g >/dev/null 2>&1; then
+ 		types='ntfs-3g ntfs'
diff --git a/os-prober.changes b/os-prober.changes
index 9d52002..ae80bfd 100644
--- a/os-prober.changes
+++ b/os-prober.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 16 18:09:08 UTC 2013 - arvidjaar@gmail.com
+
+- add os-prober-1.49-skip-LVM2_member.patch (bnc#798604)
+  * do not try to mount LVM2 PV
+
 -------------------------------------------------------------------
 Tue Jan  8 07:14:53 UTC 2013 - arvidjaar@gmail.com
 
diff --git a/os-prober.spec b/os-prober.spec
index af6490a..b14a363 100644
--- a/os-prober.spec
+++ b/os-prober.spec
@@ -38,6 +38,8 @@ Patch1:         os-prober-SUSE.patch
 Patch2:         os-prober-skip-MS-legacy-on-UEFI.patch
 # PATCH-FIX-OPENSUSE: Fix parsing of grub.cfg [bnc#796919]
 Patch3:         os-prober-1.49-fix-grub2.cfg-parsing.patch
+# PATCH-FIX-OPENSUSE: Do not try to mount LVM2 PV [bnc#798604]
+Patch4:         os-prober-1.49-skip-LVM2_member.patch
 
 Requires:       /bin/grep
 Requires:       /bin/sed
@@ -60,6 +62,7 @@ cp %SOURCE1 .
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"