X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fsfdisk.c;h=bf62c1dab42f135f41fb9042740ee09e8b7e2da6;hp=20d7dc82d640c867284d5b69ed9d2af165b0c317;hb=d600342b7d29c0176ff96a7807ebb38303ecb3a6;hpb=9e0b31a2af26b8d58a44dd80993a5e73d4942307

diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index 20d7dc8..bf62c1d 100644
--- a/daemon/sfdisk.c
+++ b/daemon/sfdisk.c
@@ -89,6 +89,21 @@ sfdisk (const char *device, int n, int cyls, int heads, int sectors,
     return -1;
   }
 
+  /* sfdisk sometimes fails on fast machines with:
+   *
+   * Re-reading the partition table ...
+   * BLKRRPART: Device or resource busy
+   * The command to re-read the partition table failed.
+   * Run partprobe(8), kpartx(8) or reboot your system now,
+   * before using mkfs
+   *
+   * Unclear if this is a bug in sfdisk or the kernel or some
+   * other component.  In any case, reread the partition table
+   * unconditionally here.
+   */
+  if (do_blockdev_rereadpt (device) == -1)
+    return -1;
+
   udev_settle ();
 
   return 0;