[udisks2/f17] Add upstream patch to fix issue with rootfs being on a bound mount

[Peter Robinson]

commit 0a53418845835c03174dec1e97976deb64c58bb8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue May 22 12:29:00 2012 +0100

    Add upstream patch to fix issue with rootfs being on a bound mount

 udisks2-root-bound-mount-fix.patch |   35 +++++++++++++++++++++++++++++++++++
 udisks2.spec                       |    6 ++++++
 2 files changed, 41 insertions(+), 0 deletions(-)
---
diff --git a/udisks2-root-bound-mount-fix.patch b/udisks2-root-bound-mount-fix.patch
new file mode 100644
index 0000000..53d711b
--- /dev/null
+++ b/udisks2-root-bound-mount-fix.patch
@@ -0,0 +1,35 @@
+From e0b8ffe3099735fefd64973e6575c67ac0759be2 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz at redhat.com>
+Date: Tue, 15 May 2012 14:17:22 +0000
+Subject: Bug 49842 – Unhandled rootfs on bind mount
+
+Don't ignore a mount just because if a subtree of the filesystem is
+mounted. Because if we do this, we may wrongly conclude the device is
+not mounted at all, which then means that it's visible in the desktop
+UI and subject to automounting.
+
+In the future, we may want a "a(ss) MountPointsFull" property that in
+addition to the mount point also contains the subtree that is mounted
+at said mountpoint.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=49842
+
+Signed-off-by: David Zeuthen <davidz at redhat.com>
+---
+diff --git a/src/udisksmountmonitor.c b/src/udisksmountmonitor.c
+index 43adaa5..36e1476 100644
+--- a/src/udisksmountmonitor.c
++++ b/src/udisksmountmonitor.c
+@@ -433,10 +433,6 @@ udisks_mount_monitor_get_mountinfo (UDisksMountMonitor  *monitor,
+           continue;
+         }
+ 
+-      /* ignore mounts where only a subtree of a filesystem is mounted */
+-      if (g_strcmp0 (encoded_root, "/") != 0)
+-        continue;
+-
+       /* Temporary work-around for btrfs, see
+        *
+        *  https://bugzilla.redhat.com/show_bug.cgi?id=495152#c31
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/udisks2.spec b/udisks2.spec
index 1d377db..c2fbc24 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -53,6 +53,8 @@ Conflicts: kernel < 2.6.26
 
 Patch0: udisks-1.97.0-Add-work-around-to-show-FS-on-CDs-USB-sticks-created.patch
 Patch1: udisks-1.97-Also-check-for-target-is-busy-when-checking-umount-8.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=49842
+Patch2: udisks2-root-bound-mount-fix.patch
 
 %description
 udisks provides a daemon, D-Bus API and command line tools for
@@ -85,6 +87,7 @@ daemon. This package is for the udisks 2.x series.
 %setup -q -n udisks-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --enable-gtk-doc
@@ -142,6 +145,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Tue May 22 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.94.0-5%{?dist}
+- Add upstream patch to fix issue with rootfs being on a bound mount
+
 * Mon May 14 2012 David Zeuthen <davidz at redhat.com> - 1.94.0-4%{?dist}
 - Actually apply the patch added in previous commit