From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 24 Sep 2010 17:53:21 +0000 (+0100)
Subject: Call blockdev --rereadpt then udev_settle after sfdisk commands.
X-Git-Tag: 1.5.20~7
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=840536ea5a0568296dfd3e483442c76b93c5a949;ds=inline

Call blockdev --rereadpt then udev_settle after sfdisk commands.

This updates commit 956fc5a3feacc970ea763697bf28fb686c875408 so
that we call udev_settle after rereading the partition table.  This
ensures that the devices nodes for the new partitions have been
created.
---

diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index 99a18bb..bf62c1d 100644
--- 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