df: Add --uuid option to print guest UUIDs instead of names (RHBZ#646821).

[libguestfs.git] / daemon / sfdisk.c

diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index 99a18bb..bf62c1d 100644 (file)
--- a/daemon/sfdisk.c
+++ b/daemon/sfdisk.c
@@ -89,8 +89,6 @@ sfdisk (const char *device, int n, int cyls, int heads, int sectors,
     return -1;
   }
 
-  udev_settle ();
-
   /* sfdisk sometimes fails on fast machines with:
    *
    * Re-reading the partition table ...
@@ -103,7 +101,12 @@ sfdisk (const char *device, int n, int cyls, int heads, int sectors,
    * other component.  In any case, reread the partition table
    * unconditionally here.
    */
-  return do_blockdev_rereadpt (device);
+  if (do_blockdev_rereadpt (device) == -1)
+    return -1;
+
+  udev_settle ();
+
+  return 0;
 }
 
 int