From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 2 Nov 2010 20:33:06 +0000 (+0000)
Subject: daemon: Tolerate failure of blockdev --rereadpt after sfdisk.
X-Git-Tag: 1.6.1~23
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=414697c5b6d44402b3d65b84aabaf1fb30dd3443;p=libguestfs.git

daemon: Tolerate failure of blockdev --rereadpt after sfdisk.

See commit 840536ea5a0568296dfd3e483442c76b93c5a949
and commit 956fc5a3feacc970ea763697bf28fb686c875408.
(cherry picked from commit 1937698c25fb9f066dba7b48ad4731927e3e74da)
---

diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index bf62c1d..ec77465 100644
--- a/daemon/sfdisk.c
+++ b/daemon/sfdisk.c
@@ -101,8 +101,7 @@ sfdisk (const char *device, int n, int cyls, int heads, int sectors,
    * other component.  In any case, reread the partition table
    * unconditionally here.
    */
-  if (do_blockdev_rereadpt (device) == -1)
-    return -1;
+  (void) command (NULL, NULL, "blockdev", "--rereadpt", NULL);
 
   udev_settle ();