Wait for the correct device after formatting
authorMartin Pitt <martinpitt@gnome.org>
Thu, 7 Jun 2012 08:25:08 +0000 (10:25 +0200)
committerMartin Pitt <martinpitt@gnome.org>
Thu, 7 Jun 2012 09:42:09 +0000 (11:42 +0200)
When creating a LUKS device, the object to wait on after mkfs (cleartext
device-mapper) is not the same as we originally started with (crypto_LUKS
device). Always wait on the object we called mkfs on.

src/udiskslinuxblock.c

index 146f19e..17e1fb2 100644 (file)
@@ -2104,6 +2104,7 @@ handle_format (UDisksBlock           *block,
    * trigger an event here
    */
   udisks_linux_block_object_trigger_uevent (UDISKS_LINUX_BLOCK_OBJECT (object_to_mkfs));
+  wait_data->object = object_to_mkfs;
   if (udisks_daemon_wait_for_object_sync (daemon,
                                           wait_for_filesystem,
                                           wait_data,