git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ruby: Use RSTRING_PTR, RSTRING_LEN for compat with Ruby 1.9 (RHBZ#760000).
[libguestfs.git]
/
daemon
/
sfdisk.c
diff --git
a/daemon/sfdisk.c
b/daemon/sfdisk.c
index
99a18bb
..
8221ffa
100644
(file)
--- a/
daemon/sfdisk.c
+++ b/
daemon/sfdisk.c
@@
-13,7
+13,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+ * Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*/
#include <config.h>
*/
#include <config.h>
@@
-89,8
+89,6
@@
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
return -1;
}
return -1;
}
- udev_settle ();
-
/* sfdisk sometimes fails on fast machines with:
*
* Re-reading the partition table ...
/* sfdisk sometimes fails on fast machines with:
*
* Re-reading the partition table ...
@@
-103,7
+101,11
@@
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
* other component. In any case, reread the partition table
* unconditionally here.
*/
* other component. In any case, reread the partition table
* unconditionally here.
*/
- return do_blockdev_rereadpt (device);
+ (void) command (NULL, NULL, "blockdev", "--rereadpt", device, NULL);
+
+ udev_settle ();
+
+ return 0;
}
int
}
int