diff -Nru udisks2-2.6.5/debian/changelog udisks2-2.6.5/debian/changelog
--- udisks2-2.6.5/debian/changelog	2017-10-06 11:47:16.000000000 +0000
+++ udisks2-2.6.5/debian/changelog	2018-02-05 15:09:05.000000000 +0000
@@ -1,3 +1,11 @@
+udisks2 (2.6.5-2ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/patches/git_add_utab.patch:
+    - backport an upstream fix to monitor and export userspace mount
+      options, allowing to hide snaps fs in gnome-disk-utilities (lp: 1637984) 
+
+ -- Andrea Azzarone <andrea.azzarone@canonical.com>  Mon, 05 Feb 2018 15:09:05 +0000
+
 udisks2 (2.6.5-2ubuntu2) artful; urgency=medium
 
   * debian/patches/git_property_change.patch:
diff -Nru udisks2-2.6.5/debian/control udisks2-2.6.5/debian/control
--- udisks2-2.6.5/debian/control	2017-07-26 14:28:13.000000000 +0000
+++ udisks2-2.6.5/debian/control	2018-02-05 15:09:05.000000000 +0000
@@ -15,6 +15,7 @@
                libgirepository1.0-dev (>= 1.30),
                libglib2.0-dev (>= 2.31.13),
                libgudev-1.0-dev (>= 165),
+               libmount-dev (>= 2.30),
                libpolkit-agent-1-dev (>= 0.97),
                libpolkit-gobject-1-dev (>= 0.97),
                libsystemd-dev (>= 209),
@@ -32,6 +33,7 @@
 Architecture: linux-any
 Multi-Arch: foreign
 Depends: dbus,
+         libmount1 (>= 2.30),
          libpam-systemd,
          parted,
          udev,
diff -Nru udisks2-2.6.5/debian/patches/git_add_utab.patch udisks2-2.6.5/debian/patches/git_add_utab.patch
--- udisks2-2.6.5/debian/patches/git_add_utab.patch	1970-01-01 00:00:00.000000000 +0000
+++ udisks2-2.6.5/debian/patches/git_add_utab.patch	2018-02-05 15:09:05.000000000 +0000
@@ -0,0 +1,1132 @@
+From: Andrea Azzarone <andrea.azzarone@canonical.com>
+Date: Mon, 5 Feb 2018 15:50:03 +0000
+Subject: Backport patch to old release
+
+---
+ configure.ac                     |  12 ++
+ data/org.freedesktop.UDisks2.xml |   3 +
+ doc/udisks2-docs.xml.in.in       |   1 +
+ doc/udisks2-sections.txt.in.in   |  21 +++
+ src/Makefile.am                  |   8 +
+ src/udisksdaemon.c               |  31 ++++
+ src/udisksdaemon.h               |   4 +
+ src/udisksdaemontypes.h          |  10 ++
+ src/udiskslinuxblock.c           |  95 ++++++++++
+ src/udiskslinuxfilesystem.c      |   6 +
+ src/udiskslinuxprovider.c        |  40 +++++
+ src/udisksprivate.h              |   9 +
+ src/udisksthreadedjob.c          |   2 +-
+ src/udisksutabentry.c            | 120 +++++++++++++
+ src/udisksutabentry.h            |  40 +++++
+ src/udisksutabmonitor.c          | 378 +++++++++++++++++++++++++++++++++++++++
+ src/udisksutabmonitor.h          |  38 ++++
+ 17 files changed, 817 insertions(+), 1 deletion(-)
+ create mode 100644 src/udisksutabentry.c
+ create mode 100644 src/udisksutabentry.h
+ create mode 100644 src/udisksutabmonitor.c
+ create mode 100644 src/udisksutabmonitor.h
+
+diff --git a/configure.ac b/configure.ac
+index 2b1f65c..d8b75ce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -159,6 +159,17 @@ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.17])
+ AC_SUBST(LIBATASMART_CFLAGS)
+ AC_SUBST(LIBATASMART_LIBS)
+ 
++PKG_CHECK_MODULES(LIBMOUNT, [mount >= 2.30],
++                  [have_libmount=yes],
++                  [have_libmount=no])
++AM_CONDITIONAL(HAVE_LIBMOUNT, test x$have_libmount = xyes)
++if test "x$have_libmount" = "xyes"; then
++  AC_DEFINE([HAVE_LIBMOUNT], 1, [Define to 1 if libmount >= 2.30 is available])
++fi
++AC_SUBST(HAVE_LIBMOUNT)
++AC_SUBST(LIBMOUNT_CFLAGS)
++AC_SUBST(LIBMOUNT_LIBS)
++
+ PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd >= 209], [have_libsystemd_login=yes],
+                   [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon],
+                   [have_libsystemd_login=yes],
+@@ -616,6 +627,7 @@ echo "
+         use /media for mounting:    ${fhs_media}
+         acl support:                ${have_acl}
+         libblockdev_part support:   ${have_libblockdev_part}
++        using libmount:             ${have_libmount}
+ 
+         compiler:                   ${CC}
+         cflags:                     ${CFLAGS}
+diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
+index ffa9f05..e5de90f 100644
+--- a/data/org.freedesktop.UDisks2.xml
++++ b/data/org.freedesktop.UDisks2.xml
+@@ -1133,6 +1133,9 @@
+     -->
+     <property name="HintSymbolicIconName" type="s" access="read"/>
+ 
++    <!-- UserspaceMountOptions: List of userspace mount options. -->
++    <property name="UserspaceMountOptions" type="as" access="read"/>
++
+     <!--
+         AddConfigurationItem:
+         @item: The configuration item to add.
+diff --git a/doc/udisks2-docs.xml.in.in b/doc/udisks2-docs.xml.in.in
+index dc42656..c8c4c34 100644
+--- a/doc/udisks2-docs.xml.in.in
++++ b/doc/udisks2-docs.xml.in.in
+@@ -431,6 +431,7 @@
+       <xi:include href="xml/udisksmountmonitor.xml"/>
+       <xi:include href="xml/udisksfstabmonitor.xml"/>
+       <xi:include href="xml/udiskscrypttabmonitor.xml"/>
++      <xi:include href="xml/udisksutabmonitor.xml"/>
+     </chapter>
+     <chapter id="ref-daemon-jobs">
+       <title>Jobs</title>
+diff --git a/doc/udisks2-sections.txt.in.in b/doc/udisks2-sections.txt.in.in
+index 3ce9124..6581e98 100644
+--- a/doc/udisks2-sections.txt.in.in
++++ b/doc/udisks2-sections.txt.in.in
+@@ -1384,6 +1384,27 @@ udisks_crypttab_entry_get_type
+ udisks_crypttab_monitor_get_type
+ </SECTION>
+ 
++<SECTION>
++<FILE>udisksutabmonitor</FILE>
++<TITLE>UDisksUtabMonitor</TITLE>
++UDisksUtabEntry
++udisks_utab_entry_get_source
++udisks_utab_entry_get_opts
++UDisksUtabMonitor
++udisks_utab_monitor_new
++udisks_utab_monitor_get_entries
++<SUBSECTION Standard>
++UDISKS_TYPE_UTAB_ENTRY
++UDISKS_UTAB_ENTRY
++UDISKS_IS_UTAB_ENTRY
++UDISKS_TYPE_UTAB_MONITOR
++UDISKS_UTAB_MONITOR
++UDISKS_IS_UTAB_MONITOR
++<SUBSECTION Private>
++udisks_utab_entry_get_type
++udisks_utab_monitor_get_type
++</SECTION>
++
+ <SECTION>
+ <FILE>UDisksPartition</FILE>
+ UDisksPartition
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 621d46a..dc30076 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -89,6 +89,12 @@ libudisks_daemon_la_SOURCES =                                                  \
+ 	$(BUILT_SOURCES)                                                       \
+ 	$(NULL)
+ 
++if HAVE_LIBMOUNT
++libudisks_daemon_la_SOURCES +=                                           \
++	udisksutabentry.h              udisksutabentry.c                       \
++	udisksutabmonitor.h            udisksutabmonitor.c
++endif # HAVE_LIBMOUNT
++
+ libudisks_daemon_la_CFLAGS =                                                   \
+ 	-I$(top_srcdir)                                                        \
+ 	-DG_LOG_DOMAIN=\"udisks\"                                              \
+@@ -97,6 +103,7 @@ libudisks_daemon_la_CFLAGS =                                                   \
+ 	$(GMODULE_CFLAGS)                                                      \
+ 	$(GUDEV_CFLAGS)                                                        \
+ 	$(LIBATASMART_CFLAGS)                                                  \
++	$(LIBMOUNT_CFLAGS)                                                     \
+ 	$(POLKIT_GOBJECT_1_CFLAGS)                                             \
+ 	$(ACL_CFLAGS)                                                          \
+ 	$(LIBSYSTEMD_LOGIN_CFLAGS)                                             \
+@@ -110,6 +117,7 @@ libudisks_daemon_la_LIBADD =                                                   \
+ 	$(GMODULE_LIBS)                                                        \
+ 	$(GUDEV_LIBS)                                                          \
+ 	$(LIBATASMART_LIBS)                                                    \
++	$(LIBMOUNT_LIBS)                                                       \
+ 	$(POLKIT_GOBJECT_1_LIBS)                                               \
+ 	$(ACL_LIBS)                                                            \
+ 	$(LIBSYSTEMD_LOGIN_LIBS)                                               \
+diff --git a/src/udisksdaemon.c b/src/udisksdaemon.c
+index 9ca899e..a17b74f 100644
+--- a/src/udisksdaemon.c
++++ b/src/udisksdaemon.c
+@@ -43,6 +43,10 @@
+ #include "udisksmodulemanager.h"
+ #include "udisksconfigmanager.h"
+ 
++#ifdef HAVE_LIBMOUNT
++#include "udisksutabmonitor.h"
++#endif
++
+ /**
+  * SECTION:udisksdaemon
+  * @title: UDisksDaemon
+@@ -78,6 +82,10 @@ struct _UDisksDaemon
+ 
+   UDisksCrypttabMonitor *crypttab_monitor;
+ 
++#ifdef HAVE_LIBMOUNT
++  UDisksUtabMonitor *utab_monitor;
++#endif
++
+   UDisksModuleManager *module_manager;
+ 
+   UDisksConfigManager *config_manager;
+@@ -127,6 +135,9 @@ udisks_daemon_finalize (GObject *object)
+   g_object_unref (daemon->mount_monitor);
+   g_object_unref (daemon->fstab_monitor);
+   g_object_unref (daemon->crypttab_monitor);
++#ifdef HAVE_LIBMOUNT
++  g_object_unref (daemon->utab_monitor);
++#endif
+ 
+   g_clear_object (&daemon->module_manager);
+ 
+@@ -295,6 +306,9 @@ udisks_daemon_constructed (GObject *object)
+ 
+   daemon->fstab_monitor = udisks_fstab_monitor_new ();
+   daemon->crypttab_monitor = udisks_crypttab_monitor_new ();
++#ifdef HAVE_LIBMOUNT
++  daemon->utab_monitor = udisks_utab_monitor_new ();
++#endif
+ 
+   /* now add providers */
+   daemon->linux_provider = udisks_linux_provider_new (daemon);
+@@ -522,6 +536,23 @@ udisks_daemon_get_crypttab_monitor (UDisksDaemon *daemon)
+   return daemon->crypttab_monitor;
+ }
+ 
++#ifdef HAVE_LIBMOUNT
++/**
++ * udisks_daemon_get_utab_monitor:
++ * @daemon: A #UDisksDaemon
++ *
++ * Gets the utab monitor used by @daemon.
++ *
++ * Returns: A #UDisksUtabMonitor. Do not free, the object is owned by @daemon.
++ */
++UDisksUtabMonitor *
++udisks_daemon_get_utab_monitor (UDisksDaemon *daemon)
++{
++  g_return_val_if_fail (UDISKS_IS_DAEMON (daemon), NULL);
++  return daemon->utab_monitor;
++}
++#endif
++
+ /**
+  * udisks_daemon_get_linux_provider:
+  * @daemon: A #UDisksDaemon.
+diff --git a/src/udisksdaemon.h b/src/udisksdaemon.h
+index a1e06b7..f9c4b62 100644
+--- a/src/udisksdaemon.h
++++ b/src/udisksdaemon.h
+@@ -21,6 +21,7 @@
+ #ifndef __UDISKS_DAEMON_H__
+ #define __UDISKS_DAEMON_H__
+ 
++#include "config.h"
+ #include "udisksdaemontypes.h"
+ 
+ G_BEGIN_DECLS
+@@ -39,6 +40,9 @@ GDBusObjectManagerServer *udisks_daemon_get_object_manager    (UDisksDaemon    *
+ UDisksMountMonitor       *udisks_daemon_get_mount_monitor     (UDisksDaemon    *daemon);
+ UDisksFstabMonitor       *udisks_daemon_get_fstab_monitor     (UDisksDaemon    *daemon);
+ UDisksCrypttabMonitor    *udisks_daemon_get_crypttab_monitor  (UDisksDaemon    *daemon);
++#ifdef HAVE_LIBMOUNT
++UDisksUtabMonitor        *udisks_daemon_get_utab_monitor      (UDisksDaemon    *daemon);
++#endif
+ UDisksLinuxProvider      *udisks_daemon_get_linux_provider    (UDisksDaemon    *daemon);
+ PolkitAuthority          *udisks_daemon_get_authority         (UDisksDaemon    *daemon);
+ UDisksState              *udisks_daemon_get_state             (UDisksDaemon    *daemon);
+diff --git a/src/udisksdaemontypes.h b/src/udisksdaemontypes.h
+index 753c4a4..e6a44bb 100644
+--- a/src/udisksdaemontypes.h
++++ b/src/udisksdaemontypes.h
+@@ -20,6 +20,8 @@
+ #ifndef __UDISKS_DAEMON_TYPES_H__
+ #define __UDISKS_DAEMON_TYPES_H__
+ 
++#include "config.h"
++
+ #include <gio/gio.h>
+ #include <polkit/polkit.h>
+ #include <udisks/udisks.h>
+@@ -102,6 +104,14 @@ typedef struct _UDisksCrypttabMonitor UDisksCrypttabMonitor;
+ struct _UDisksCrypttabEntry;
+ typedef struct _UDisksCrypttabEntry UDisksCrypttabEntry;
+ 
++#ifdef HAVE_LIBMOUNT
++struct _UDisksUtabMonitor;
++typedef struct _UDisksUtabMonitor UDisksUtabMonitor;
++
++struct _UDisksUtabEntry;
++typedef struct _UDisksUtabEntry UDisksUtabEntry;
++#endif
++
+ struct _UDisksLinuxPartition;
+ typedef struct _UDisksLinuxPartition UDisksLinuxPartition;
+ 
+diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
+index 13a36b4..c582bab 100644
+--- a/src/udiskslinuxblock.c
++++ b/src/udiskslinuxblock.c
+@@ -63,6 +63,11 @@
+ #include "udiskslinuxpartition.h"
+ #include "udiskslinuxencrypted.h"
+ 
++#ifdef HAVE_LIBMOUNT
++#include "udisksutabmonitor.h"
++#include "udisksutabentry.h"
++#endif
++
+ /**
+  * SECTION:udiskslinuxblock
+  * @title: UDisksLinuxBlock
+@@ -434,6 +439,26 @@ update_hints (UDisksLinuxBlock  *block,
+ }
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
++static void
++process_device_symlinks (const gchar      *device,
++                         UDisksLinuxBlock *block,
++                         gpointer          object,
++                         GList           **ret)
++{
++  const gchar *const *symlinks;
++  guint n;
++
++  if (g_strcmp0 (device, udisks_block_get_device (UDISKS_BLOCK (block))) == 0)
++    *ret = g_list_prepend (*ret, g_object_ref (object));
++  else
++    {
++      symlinks = udisks_block_get_symlinks (UDISKS_BLOCK (block));
++      if (symlinks != NULL)
++        for (n = 0; symlinks[n] != NULL; n++)
++          if (g_strcmp0 (device, symlinks[n]) == 0)
++            *ret = g_list_prepend (*ret, g_object_ref (object));
++    }
++}
+ 
+ static GList *
+ find_fstab_entries_for_device (UDisksLinuxBlock *block,
+@@ -622,6 +647,34 @@ find_crypttab_entries_for_device (UDisksLinuxBlock *block,
+   return ret;
+ }
+ 
++#ifdef HAVE_LIBMOUNT
++static GList *
++find_utab_entries_for_device (UDisksLinuxBlock *block,
++                              UDisksDaemon     *daemon)
++{
++  GSList *entries, *l;
++  GList *ret;
++
++  ret = NULL;
++
++  /* if this is too slow, we could add lookup methods to UDisksUtabMonitor... */
++  entries = udisks_utab_monitor_get_entries (udisks_daemon_get_utab_monitor (daemon));
++  for (l = entries; l != NULL; l = l->next)
++    {
++      UDisksUtabEntry *entry = UDISKS_UTAB_ENTRY (l->data);
++      const gchar *source = udisks_utab_entry_get_source (entry);
++
++      if (!g_str_has_prefix (source, "/dev"))
++        continue;
++
++      process_device_symlinks (source, block, entry, &ret);
++    }
++
++  g_slist_free_full (entries, g_object_unref);
++  return ret;
++}
++#endif
++
+ static void
+ add_fstab_entry (GVariantBuilder  *builder,
+                  UDisksFstabEntry *entry)
+@@ -753,6 +806,31 @@ calculate_configuration (UDisksLinuxBlock  *block,
+   return ret;
+ }
+ 
++#ifdef HAVE_LIBMOUNT
++static gchar **
++calculate_userspace_mount_options (UDisksLinuxBlock *block,
++                                   UDisksDaemon     *daemon)
++{
++  GList *entries, *l;
++  GPtrArray *ret;
++
++  ret = g_ptr_array_new ();
++
++  /* Get the /run/mounts/utab entries */
++  entries = find_utab_entries_for_device (block, daemon);
++  for (l = entries; l != NULL; l = l->next) {
++    UDisksUtabEntry *entry = UDISKS_UTAB_ENTRY (l->data);
++    const gchar * const *opts = udisks_utab_entry_get_opts (entry);
++    for (gint i = 0; opts[i] != NULL; ++i)
++      g_ptr_array_add (ret, g_strdup (opts[i]));
++  }
++  g_ptr_array_add (ret, NULL);
++  g_list_free_full (entries, g_object_unref);
++
++  return (gchar **) g_ptr_array_free (ret, FALSE);
++}
++#endif
++
+ static void
+ update_configuration (UDisksLinuxBlock  *block,
+                       UDisksDaemon      *daemon)
+@@ -772,6 +850,20 @@ update_configuration (UDisksLinuxBlock  *block,
+   udisks_block_set_configuration (UDISKS_BLOCK (block), configuration);
+ }
+ 
++#ifdef HAVE_LIBMOUNT
++static void
++update_userspace_mount_options (UDisksLinuxBlock *block,
++                                UDisksDaemon     *daemon)
++{
++  gchar **opts;
++
++  opts = calculate_userspace_mount_options (block, daemon);
++  udisks_block_set_userspace_mount_options (UDISKS_BLOCK (block), (const gchar * const*) opts);
++
++  g_strfreev (opts);
++}
++#endif
++
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
+ static GList *
+@@ -1133,6 +1225,9 @@ udisks_linux_block_update (UDisksLinuxBlock       *block,
+ 
+   update_hints (block, device, drive);
+   update_configuration (block, daemon);
++#ifdef HAVE_LIBMOUNT
++  update_userspace_mount_options (block, daemon);
++#endif
+   update_mdraid (block, device, drive, object_manager);
+ 
+  out:
+diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
+index fbf05f4..80ef378 100644
+--- a/src/udiskslinuxfilesystem.c
++++ b/src/udiskslinuxfilesystem.c
+@@ -538,6 +538,12 @@ is_mount_option_allowed (const FSMountOptions *fsmo,
+         }
+     }
+ 
++  if (g_str_has_prefix (option, "x-"))
++    {
++      allowed = TRUE;
++      goto out;
++    }
++
+  out:
+   return allowed;
+ }
+diff --git a/src/udiskslinuxprovider.c b/src/udiskslinuxprovider.c
+index 434325b..5bd2bd0 100644
+--- a/src/udiskslinuxprovider.c
++++ b/src/udiskslinuxprovider.c
+@@ -124,6 +124,16 @@ static void crypttab_monitor_on_entry_removed (UDisksCrypttabMonitor *monitor,
+                                                UDisksCrypttabEntry   *entry,
+                                                gpointer               user_data);
+ 
++#ifdef HAVE_LIBMOUNT
++static void utab_monitor_on_entry_added (UDisksUtabMonitor *monitor,
++                                         UDisksUtabEntry   *entry,
++                                         gpointer           user_data);
++
++static void utab_monitor_on_entry_removed (UDisksUtabMonitor *monitor,
++                                           UDisksUtabEntry   *entry,
++                                           gpointer           user_data);
++#endif
++
+ static void on_etc_udisks2_dir_monitor_changed (GFileMonitor     *monitor,
+                                                 GFile            *file,
+                                                 GFile            *other_file,
+@@ -685,6 +695,16 @@ udisks_linux_provider_start (UDisksProvider *_provider)
+                     "entry-removed",
+                     G_CALLBACK (crypttab_monitor_on_entry_removed),
+                     provider);
++#ifdef HAVE_LIBMOUNT
++  g_signal_connect (udisks_daemon_get_utab_monitor (daemon),
++                    "entry-added",
++                    G_CALLBACK (utab_monitor_on_entry_added),
++                    provider);
++  g_signal_connect (udisks_daemon_get_utab_monitor (daemon),
++                    "entry-removed",
++                    G_CALLBACK (utab_monitor_on_entry_removed),
++                    provider);
++#endif
+ 
+   /* The drive configurations need to be re-applied when system wakes up from suspend/hibernate */
+   dbus_conn = udisks_daemon_get_connection (daemon);
+@@ -1481,3 +1501,23 @@ crypttab_monitor_on_entry_removed (UDisksCrypttabMonitor *monitor,
+   UDisksLinuxProvider *provider = UDISKS_LINUX_PROVIDER (user_data);
+   update_all_block_objects (provider);
+ }
++
++#ifdef HAVE_LIBMOUNT
++static void
++utab_monitor_on_entry_added (UDisksUtabMonitor *monitor,
++                             UDisksUtabEntry   *entry,
++                             gpointer           user_data)
++{
++  UDisksLinuxProvider *provider = UDISKS_LINUX_PROVIDER (user_data);
++  update_all_block_objects (provider);
++}
++
++static void
++utab_monitor_on_entry_removed (UDisksUtabMonitor *monitor,
++                               UDisksUtabEntry   *entry,
++                               gpointer           user_data)
++{
++  UDisksLinuxProvider *provider = UDISKS_LINUX_PROVIDER (user_data);
++  update_all_block_objects (provider);
++}
++#endif
+diff --git a/src/udisksprivate.h b/src/udisksprivate.h
+index 5dfd77e..019f154 100644
+--- a/src/udisksprivate.h
++++ b/src/udisksprivate.h
+@@ -21,9 +21,14 @@
+ #ifndef __UDISKS_PRIVATE_H__
+ #define __UDISKS_PRIVATE_H__
+ 
++#include "config.h"
+ #include "udisksdaemontypes.h"
+ #include <mntent.h>
+ 
++#ifdef HAVE_LIBMOUNT
++#include <libmount/libmount.h>
++#endif
++
+ G_BEGIN_DECLS
+ 
+ UDisksMount *_udisks_mount_new (dev_t dev,
+@@ -37,6 +42,10 @@ UDisksCrypttabEntry *_udisks_crypttab_entry_new (const gchar *name,
+                                                  const gchar *passphrase,
+                                                  const gchar *options);
+ 
++#ifdef HAVE_LIBMOUNT
++UDisksUtabEntry * _udisks_utab_entry_new (struct libmnt_fs *fs);
++#endif
++
+ G_END_DECLS
+ 
+ #endif /* __UDISKS_PRIVATE_H__ */
+diff --git a/src/udisksthreadedjob.c b/src/udisksthreadedjob.c
+index 035fd48..2feeba6 100644
+--- a/src/udisksthreadedjob.c
++++ b/src/udisksthreadedjob.c
+@@ -205,7 +205,7 @@ run_task_job (GTask            *task,
+                                        &job->job_error);
+     }
+ 
+-  g_main_context_invoke (g_main_context_get_thread_default (), job_complete, job);
++  g_main_context_invoke (g_task_get_context (task), job_complete, job);
+ }
+ 
+ static void
+diff --git a/src/udisksutabentry.c b/src/udisksutabentry.c
+new file mode 100644
+index 0000000..24f3396
+--- /dev/null
++++ b/src/udisksutabentry.c
+@@ -0,0 +1,120 @@
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
++ *
++ * Copyright (C) 2017 Andrea Azzarone <andrea.azzarone@canonical.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ *
++ */
++
++#include <glib.h>
++#include <glib-object.h>
++
++#include "udisksutabentry.h"
++#include "udisksprivate.h"
++
++/**
++ * UDisksUtabEntry:
++ *
++ * The #UDisksUtabEntry structure contains only private data and should
++ * only be accessed using the provided API.
++ */
++struct _UDisksUtabEntry
++{
++  GObject parent_instance;
++
++  gchar  *source;
++  gchar **opts;
++};
++
++typedef struct _UDisksUtabEntryClass UDisksUtabEntryClass;
++
++struct _UDisksUtabEntryClass
++{
++  GObjectClass parent_class;
++};
++
++G_DEFINE_TYPE (UDisksUtabEntry, udisks_utab_entry, G_TYPE_OBJECT);
++
++static void
++udisks_utab_entry_init (UDisksUtabEntry *entry)
++{
++  entry->source = NULL;
++  entry->opts = NULL;
++}
++
++static void
++udisks_utab_entry_finalize (GObject *object)
++{
++  UDisksUtabEntry *entry = UDISKS_UTAB_ENTRY (object);
++
++  g_free (entry->source);
++  g_strfreev (entry->opts);
++
++  if (G_OBJECT_CLASS (udisks_utab_entry_parent_class)->finalize)
++    G_OBJECT_CLASS (udisks_utab_entry_parent_class)->finalize (object);
++}
++
++static void
++udisks_utab_entry_class_init (UDisksUtabEntryClass *klass)
++{
++  GObjectClass *gobject_class;
++
++  gobject_class = G_OBJECT_CLASS (klass);
++  gobject_class->finalize = udisks_utab_entry_finalize;
++}
++
++
++UDisksUtabEntry *
++_udisks_utab_entry_new (struct libmnt_fs *fs)
++{
++  UDisksUtabEntry *entry;
++
++  entry = UDISKS_UTAB_ENTRY (g_object_new (UDISKS_TYPE_UTAB_ENTRY, NULL));
++
++  entry->source = g_strdup (mnt_fs_get_source (fs));
++  entry->opts = g_strsplit (mnt_fs_get_user_options (fs), ",", -1);
++
++  return entry;
++}
++
++/**
++ * udisks_utab_entry_get_source:
++ * @entry: A #UDisksUtabEntry.
++ *
++ * Gets the source field of @entry.
++ *
++ * Returns: The source field.
++ */
++const gchar *
++udisks_utab_entry_get_source (UDisksUtabEntry *entry)
++{
++  g_return_val_if_fail (UDISKS_IS_UTAB_ENTRY (entry), NULL);
++  return entry->source;
++}
++
++/**
++ * udisks_utab_entry_get_opts:
++ * @entry: A #UDisksUtabEntry.
++ *
++ * Gets the opts field of @entry.
++ *
++ * Returns: The opts field.
++ */
++const gchar * const *
++udisks_utab_entry_get_opts (UDisksUtabEntry *entry)
++{
++  g_return_val_if_fail (UDISKS_IS_UTAB_ENTRY (entry), NULL);
++  return (const gchar * const *) entry->opts;
++}
+diff --git a/src/udisksutabentry.h b/src/udisksutabentry.h
+new file mode 100644
+index 0000000..e9facc6
+--- /dev/null
++++ b/src/udisksutabentry.h
+@@ -0,0 +1,40 @@
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
++ *
++ * Copyright (C) 2017 Andrea Azzarone <andrea.azzarone@canonical.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ *
++ */
++
++#ifndef __UDISKS_UTAB_ENTRY_H__
++#define __UDISKS_UTAB_ENTRY_H__
++
++#include "udisksdaemontypes.h"
++
++G_BEGIN_DECLS
++
++#define UDISKS_TYPE_UTAB_ENTRY  (udisks_utab_entry_get_type ())
++#define UDISKS_UTAB_ENTRY(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), UDISKS_TYPE_UTAB_ENTRY, UDisksUtabEntry))
++#define UDISKS_IS_UTAB_ENTRY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UDISKS_TYPE_UTAB_ENTRY))
++
++GType                udisks_utab_entry_get_type   (void) G_GNUC_CONST;
++const gchar         *udisks_utab_entry_get_source (UDisksUtabEntry *entry);
++const gchar * const *udisks_utab_entry_get_opts   (UDisksUtabEntry *entry);
++
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(UDisksUtabEntry, g_object_unref)
++
++G_END_DECLS
++
++#endif /* __UDISKS_UTAB_ENTRY_H__ */
+diff --git a/src/udisksutabmonitor.c b/src/udisksutabmonitor.c
+new file mode 100644
+index 0000000..11e2141
+--- /dev/null
++++ b/src/udisksutabmonitor.c
+@@ -0,0 +1,378 @@
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
++ *
++ * Copyright (C) 2017 Andrea Azzarone <andrea.azzarone@canonical.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ *
++ */
++
++#include <libmount/libmount.h>
++
++#include <glib.h>
++#include <glib-object.h>
++
++#include "udisksutabmonitor.h"
++#include "udisksutabentry.h"
++#include "udisksprivate.h"
++
++/**
++ * SECTION:udisksutabmonitor
++ * @title: UDisksUtabMonitor
++ * @short_description: Monitors entries in the utab file
++ *
++ * This type is used for monitoring entries in the
++ * <filename>/run/mounts/utab</filename> file.
++ */
++
++/**
++ * UDisksUtabMonitor:
++ *
++ * The #UDisksUtabMonitor structure contains only private data and
++ * should only be accessed using the provided API.
++ */
++struct _UDisksUtabMonitor
++{
++  GObject parent_instance;
++
++  GRWLock lock;
++
++  GIOChannel *utab_channel;
++  GSource *utab_watch_source;
++
++  struct libmnt_monitor *mn;
++  struct libmnt_table *current_tb;
++};
++
++typedef struct _UDisksUtabMonitorClass UDisksUtabMonitorClass;
++
++struct _UDisksUtabMonitorClass
++{
++  GObjectClass parent_class;
++
++  void (*entry_added)   (UDisksUtabMonitor *monitor,
++                         UDisksUtabEntry   *entry);
++  void (*entry_removed) (UDisksUtabMonitor *monitor,
++                         UDisksUtabEntry   *entry);
++};
++
++enum
++{
++  ENTRY_ADDED_SIGNAL,
++  ENTRY_REMOVED_SIGNAL,
++  LAST_SIGNAL,
++};
++
++static guint signals[LAST_SIGNAL] = { 0 };
++
++G_DEFINE_TYPE (UDisksUtabMonitor, udisks_utab_monitor, G_TYPE_OBJECT)
++
++static void udisks_utab_monitor_ensure (UDisksUtabMonitor *monitor);
++static void udisks_utab_monitor_invalidate (UDisksUtabMonitor *monitor);
++static void udisks_utab_monitor_constructed (GObject *object);
++
++static void
++udisks_utab_monitor_init (UDisksUtabMonitor *monitor)
++{
++  g_rw_lock_init (&monitor->lock);
++  monitor->utab_channel = NULL;
++  monitor->utab_watch_source = NULL;
++  monitor->mn = NULL;
++  monitor->current_tb = NULL;
++}
++
++static void
++udisks_utab_monitor_finalize (GObject *object)
++{
++  UDisksUtabMonitor *monitor = UDISKS_UTAB_MONITOR (object);
++
++  g_rw_lock_clear (&monitor->lock);
++  if (monitor->utab_channel != NULL)
++    g_io_channel_unref (monitor->utab_channel);
++  if (monitor->utab_watch_source != NULL)
++    g_source_destroy (monitor->utab_watch_source);
++  if (monitor->mn)
++    mnt_unref_monitor (monitor->mn);
++  if (monitor->current_tb)
++    mnt_free_table (monitor->current_tb);
++
++  if (G_OBJECT_CLASS (udisks_utab_monitor_parent_class)->finalize != NULL)
++    G_OBJECT_CLASS (udisks_utab_monitor_parent_class)->finalize (object);
++}
++
++
++static void
++udisks_utab_monitor_class_init (UDisksUtabMonitorClass *klass)
++{
++  GObjectClass *gobject_class = (GObjectClass *) klass;
++
++  gobject_class->finalize    = udisks_utab_monitor_finalize;
++  gobject_class->constructed = udisks_utab_monitor_constructed;
++
++  /**
++   * UDisksUtabMonitor::entry-added
++   * @monitor: A #UDisksUtabMonitor.
++   * @entry: The #UDisksUtabEntry that was added.
++   *
++   * Emitted when a utab entry is added.
++   *
++   * This signal is emitted in the
++   * <link linkend="g-main-context-push-thread-default">thread-default main loop</link>
++   * that @monitor was created in.
++   */
++  signals[ENTRY_ADDED_SIGNAL] = g_signal_new ("entry-added",
++                                              G_OBJECT_CLASS_TYPE (klass),
++                                              G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
++                                              G_STRUCT_OFFSET (UDisksUtabMonitorClass, entry_added),
++                                              NULL,
++                                              NULL,
++                                              g_cclosure_marshal_VOID__OBJECT,
++                                              G_TYPE_NONE,
++                                              1,
++                                              UDISKS_TYPE_UTAB_ENTRY);
++
++  /**
++   * UDisksFstabMonitor::entry-removed
++   * @monitor: A #UDisksUtabMonitor.
++   * @entry: The #UDisksUtabEntry that was removed.
++   *
++   * Emitted when a utab entry is removed.
++   *
++   * This signal is emitted in the
++   * <link linkend="g-main-context-push-thread-default">thread-default main loop</link>
++   * that @monitor was created in.
++   */
++  signals[ENTRY_REMOVED_SIGNAL] = g_signal_new ("entry-removed",
++                                                G_OBJECT_CLASS_TYPE (klass),
++                                                G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
++                                                G_STRUCT_OFFSET (UDisksUtabMonitorClass, entry_removed),
++                                                NULL,
++                                                NULL,
++                                                g_cclosure_marshal_VOID__OBJECT,
++                                                G_TYPE_NONE,
++                                                1,
++                                                UDISKS_TYPE_UTAB_ENTRY);
++}
++
++static gboolean
++fs_has_user_options (struct libmnt_fs *fs)
++{
++  return mnt_fs_get_user_options (fs) != NULL;
++}
++
++static gboolean
++fs_has_user_options_match_func (struct libmnt_fs *fs, void *data)
++{
++  return fs_has_user_options (fs);
++}
++
++static void
++reload_utab_entries (UDisksUtabMonitor *monitor)
++{
++  struct libmnt_table *old_tb;
++  struct libmnt_tabdiff *diff = NULL;
++  struct libmnt_iter *itr;
++  struct libmnt_fs *old, *new;
++  int rc = -1, change;
++
++  g_rw_lock_writer_lock (&monitor->lock);
++  udisks_utab_monitor_ensure (monitor);
++  old_tb = monitor->current_tb;
++  mnt_ref_table (old_tb);
++  g_rw_lock_writer_unlock (&monitor->lock);
++
++  g_rw_lock_writer_lock (&monitor->lock);
++  udisks_utab_monitor_invalidate (monitor);
++  udisks_utab_monitor_ensure (monitor);
++  g_rw_lock_writer_unlock (&monitor->lock);
++
++  g_rw_lock_reader_lock (&monitor->lock);
++  diff = mnt_new_tabdiff ();
++  itr = mnt_new_iter (MNT_ITER_FORWARD);
++  g_rw_lock_reader_unlock (&monitor->lock);
++
++  if (!old_tb || !monitor->current_tb || !diff || !itr)
++    goto out;
++
++  rc = mnt_diff_tables (diff, old_tb, monitor->current_tb);
++
++  if (rc < 0)
++    goto out;
++
++  while (mnt_tabdiff_next_change (diff, itr, &old, &new, &change) == 0)
++    {
++      if (!fs_has_user_options (old) && !fs_has_user_options (new))
++        continue;
++
++      switch (change)
++        {
++          case MNT_TABDIFF_UMOUNT:
++            if (fs_has_user_options (old))
++              {
++                g_autoptr (UDisksUtabEntry) entry = _udisks_utab_entry_new (old);
++                g_signal_emit (monitor, signals[ENTRY_REMOVED_SIGNAL], 0, entry);
++              }
++            break;
++          case MNT_TABDIFF_REMOUNT:
++            if (fs_has_user_options (old))
++              {
++                g_autoptr (UDisksUtabEntry) entry = _udisks_utab_entry_new (old);
++                g_signal_emit (monitor, signals[ENTRY_REMOVED_SIGNAL], 0, entry);
++              }
++            if (fs_has_user_options (new))
++              {
++                g_autoptr (UDisksUtabEntry) entry = _udisks_utab_entry_new (new);
++                g_signal_emit (monitor, signals[ENTRY_ADDED_SIGNAL], 0, entry);
++              }
++            break;
++          case MNT_TABDIFF_MOUNT:
++              if (fs_has_user_options (new))
++              {
++                g_autoptr (UDisksUtabEntry) entry = _udisks_utab_entry_new (new);
++                g_signal_emit (monitor, signals[ENTRY_ADDED_SIGNAL], 0, entry);
++              }
++            break;
++          }
++    }
++
++out:
++  if (old_tb)
++    mnt_unref_table (old_tb);
++  if (diff)
++    mnt_free_tabdiff (diff);
++  if (itr)
++    mnt_free_iter (itr);
++}
++
++static gboolean
++utab_changed_event (GIOChannel *channel,
++                    GIOCondition cond,
++                    gpointer user_data)
++{
++  UDisksUtabMonitor *monitor = UDISKS_UTAB_MONITOR (user_data);
++  gboolean need_reload;
++  gint r;
++
++  if (cond & ~G_IO_IN)
++    return G_SOURCE_CONTINUE;
++
++  need_reload = FALSE;
++
++  do
++    {
++      r = mnt_monitor_next_change (monitor->mn, NULL, NULL);
++
++      if (r == 0)
++        need_reload = TRUE;
++    } while (r == 0);
++
++  if (need_reload)
++    reload_utab_entries (monitor);
++
++  return G_SOURCE_CONTINUE;
++}
++
++static void
++udisks_utab_monitor_constructed (GObject *object)
++{
++  UDisksUtabMonitor *monitor = UDISKS_UTAB_MONITOR (object);
++
++  monitor->mn = mnt_new_monitor();
++  // Monitor only changes in /run/mount/utab
++  mnt_monitor_enable_userspace (monitor->mn, TRUE, NULL);
++
++  monitor->utab_channel = g_io_channel_unix_new (mnt_monitor_get_fd (monitor->mn));
++  monitor->utab_watch_source = g_io_create_watch (monitor->utab_channel, G_IO_IN);
++  g_source_set_callback (monitor->utab_watch_source, (GSourceFunc) utab_changed_event, monitor, NULL);
++  g_source_attach (monitor->utab_watch_source, g_main_context_get_thread_default ());
++  g_source_unref (monitor->utab_watch_source);
++
++  if (G_OBJECT_CLASS (udisks_utab_monitor_parent_class)->constructed != NULL)
++    (*G_OBJECT_CLASS (udisks_utab_monitor_parent_class)->constructed) (object);
++}
++
++/**
++ * udisks_utab_monitor_new:
++ *
++ * Creates a new #UDisksUtabMonitor object.
++ *
++ * Signals are emitted in the <link
++ * linkend="g-main-context-push-thread-default">thread-default main
++ * loop</link> that this function is called from.
++ *
++ * Returns: A #UDisksUtabMonitor. Free with g_object_unref().
++ */
++UDisksUtabMonitor *
++udisks_utab_monitor_new (void)
++{
++  return UDISKS_UTAB_MONITOR (g_object_new (UDISKS_TYPE_UTAB_MONITOR, NULL));
++}
++
++/**
++ * udisks_utab_monitor_get_entries:
++ * @monitor: A #UDisksUtabMonitor.
++ *
++ * Gets all /run/mounts/utab entries
++ *
++ * Returns: (transfer full) (element-type UDisksUtabEntry): A list of #UDisksUtabEntry objects that must be freed with g_slist_free() after each element has been freed with g_object_unref().
++ */
++GSList *
++udisks_utab_monitor_get_entries (UDisksUtabMonitor  *monitor)
++{
++  GSList *ret;
++  struct libmnt_iter *itr;
++  struct libmnt_fs *fs;
++
++  g_return_val_if_fail (UDISKS_IS_UTAB_MONITOR (monitor), NULL);
++
++  g_rw_lock_writer_lock (&monitor->lock);
++  udisks_utab_monitor_ensure (monitor);
++  g_rw_lock_writer_unlock (&monitor->lock);
++
++  g_rw_lock_reader_lock (&monitor->lock);
++
++  ret = NULL;
++  itr = mnt_new_iter (MNT_ITER_FORWARD);
++  while (mnt_table_find_next_fs (monitor->current_tb, itr, fs_has_user_options_match_func, NULL, &fs) == 0)
++    {
++      UDisksUtabEntry *entry;
++      entry = _udisks_utab_entry_new (fs);
++      ret = g_slist_prepend (ret, entry);
++    }
++  mnt_free_iter (itr);
++
++  g_rw_lock_reader_unlock (&monitor->lock);
++
++  return ret;
++}
++
++static void
++udisks_utab_monitor_ensure (UDisksUtabMonitor *monitor)
++{
++  if (monitor->current_tb)
++    return;
++
++  monitor->current_tb = mnt_new_table ();
++  mnt_table_parse_mtab (monitor->current_tb, NULL);
++}
++
++static void
++udisks_utab_monitor_invalidate (UDisksUtabMonitor *monitor)
++{
++  if (!monitor->current_tb)
++    return;
++
++  mnt_unref_table (monitor->current_tb);
++  monitor->current_tb = NULL;
++}
+diff --git a/src/udisksutabmonitor.h b/src/udisksutabmonitor.h
+new file mode 100644
+index 0000000..dc8fc58
+--- /dev/null
++++ b/src/udisksutabmonitor.h
+@@ -0,0 +1,38 @@
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
++ *
++ * Copyright (C) 2017 Andrea Azzarone <andrea.azzarone@canonical.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ *
++ */
++
++#ifndef __UDISKS_UTAB_MONITOR_H__
++#define __UDISKS_UTAB_MONITOR_H__
++
++#include "udisksdaemontypes.h"
++
++G_BEGIN_DECLS
++
++#define UDISKS_TYPE_UTAB_MONITOR  (udisks_utab_monitor_get_type ())
++#define UDISKS_UTAB_MONITOR(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), UDISKS_TYPE_UTAB_MONITOR, UDisksUtabMonitor))
++#define UDISKS_IS_UTAB_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UDISKS_TYPE_UTAB_MONITOR))
++
++GType              udisks_utab_monitor_get_type    (void) G_GNUC_CONST;
++UDisksUtabMonitor *udisks_utab_monitor_new         (void);
++GSList            *udisks_utab_monitor_get_entries (UDisksUtabMonitor *monitor);
++
++G_END_DECLS
++
++#endif /* __UDISKS_UTAB_MONITOR_H__ */
diff -Nru udisks2-2.6.5/debian/patches/series udisks2-2.6.5/debian/patches/series
--- udisks2-2.6.5/debian/patches/series	2017-10-06 11:46:52.000000000 +0000
+++ udisks2-2.6.5/debian/patches/series	2018-02-05 15:04:31.000000000 +0000
@@ -1,3 +1,4 @@
 # cherry-picked from upstream
 git_property_change.patch
+git_add_utab.patch
 # Debian patches for udisks