Add a Block.Rescan() method

This is needed when restoring a disk image - the kernel won't reread
the partition table on its own and BLKRRPART is unfortunately not
permitted if not uid 0.

Signed-off-by: David Zeuthen <zeuthen@gmail.com>

diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
index 3eadaf8..d46ff79 100644 (file)
--- a/data/org.freedesktop.UDisks2.xml
+++ b/data/org.freedesktop.UDisks2.xml
@@ -1087,6 +1087,24 @@
       <arg name="fd" direction="out" type="h"/>
     </method>
 
+    <!--
+        Rescan:
+        @options: Options (currently unused except for <link linkend="udisks-std-options">standard options</link>).
+
+        Request that the kernel and core OS rescans the contents of
+        the device and update their state to reflect this (including
+        things such as the <filename>/dev/disk/</filename> hierarchy
+        of symlinks). This includes requesting that the kernel
+        re-reads the partition table, if appropriate.
+
+        This is usually not needed since the OS automatically does
+        this when the last process with a writable file descriptor for
+        the device closes it.
+    -->
+    <method name="Rescan">
+      <arg name="options" direction="in" type="a{sv}"/>
+    </method>
+
   </interface>
 
   <!-- ********************************************************************** -->

diff --git a/data/org.freedesktop.udisks2.policy.in b/data/org.freedesktop.udisks2.policy.in
index 4f1fd5d..d9f4c19 100644 (file)
--- a/data/org.freedesktop.udisks2.policy.in
+++ b/data/org.freedesktop.udisks2.policy.in
@@ -273,6 +273,17 @@
     </defaults>
   </action>
 
+  <!-- rescan a device -->
+  <action id="org.freedesktop.udisks2.rescan">
+    <_description>Rescan a device</_description>
+    <_message>Authentication is to rescan a device</_message>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
   <!-- ###################################################################### -->
   <!-- Open a device for reading (for creating / restoring disk images) -->
 

diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
index 159c253..0db40cd 100644 (file)
--- a/src/udiskslinuxblock.c
+++ b/src/udiskslinuxblock.c
@@ -2533,6 +2533,60 @@ handle_open_for_benchmark (UDisksBlock           *block,
 
 /* ---------------------------------------------------------------------------------------------------- */
 
+static gboolean
+handle_rescan (UDisksBlock           *block,
+               GDBusMethodInvocation *invocation,
+               GVariant              *options)
+{
+  UDisksObject *object = NULL;
+  GUdevDevice *udev_device = NULL;
+  UDisksDaemon *daemon;
+  const gchar *action_id;
+  const gchar *message;
+  GError *error = NULL;
+
+  object = udisks_daemon_util_dup_object (block, &error);
+  if (object == NULL)
+    {
+      g_dbus_method_invocation_take_error (invocation, error);
+      goto out;
+    }
+
+  daemon = udisks_linux_block_object_get_daemon (UDISKS_LINUX_BLOCK_OBJECT (object));
+
+  /* Translators: Shown in authentication dialog when an application
+   * wants to rescan a device.
+   *
+   * Do not translate $(drive), it's a placeholder and will
+   * be replaced by the name of the drive/device in question
+   */
+  message = N_("Authentication is required to rescan $(drive)");
+  action_id = "org.freedesktop.udisks2.rescan";
+
+  if (!udisks_daemon_util_check_authorization_sync (daemon,
+                                                    object,
+                                                    action_id,
+                                                    options,
+                                                    message,
+                                                    invocation))
+    goto out;
+
+  udev_device = udisks_linux_block_object_get_device (UDISKS_LINUX_BLOCK_OBJECT (object));
+
+  udisks_linux_block_object_trigger_uevent (UDISKS_LINUX_BLOCK_OBJECT (object));
+  if (g_strcmp0 (g_udev_device_get_devtype (udev_device), "disk") == 0)
+    udisks_linux_block_object_reread_partition_table (UDISKS_LINUX_BLOCK_OBJECT (object));
+
+  udisks_block_complete_rescan (block, invocation);
+
+ out:
+  g_clear_object (&udev_device);
+  g_clear_object (&object);
+  return TRUE; /* returning true means that we handled the method invocation */
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
 static void
 block_iface_init (UDisksBlockIface *iface)
 {
@@ -2544,4 +2598,5 @@ block_iface_init (UDisksBlockIface *iface)
   iface->handle_open_for_backup           = handle_open_for_backup;
   iface->handle_open_for_restore          = handle_open_for_restore;
   iface->handle_open_for_benchmark        = handle_open_for_benchmark;
+  iface->handle_rescan                    = handle_rescan;
 }