mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: wipefs: Use --force option if available.

Browse Source 
See https://bugzilla.redhat.com/show_bug.cgi?id=872831
and https://bugzilla.redhat.com/show_bug.cgi?id=865961
This commit is contained in:
Richard W.M. Jones
2012-11-19 15:43:52 +00:00
parent b5b475ab82
commit 3454cfb73c
1 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
daemon/zero.c
View File

@@ -82,14 +82,52 @@ optgroup_wipefs_available (void)
return prog_exists (str_wipefs);
}
/* See RHBZ#872831 */
static int
wipefs_has_force_option (void)
{
static int flag = -1;
int r;
char *out, *err;
if (flag == -1) {
r = command (&out, &err, "wipefs", "--help", NULL);
if (r == -1) {
reply_with_error ("%s", err);
free (out);
free (err);
return -1;
}
free (err);
flag = strstr (out, "--force") != NULL;
free (out);
}
return flag;
}
int
do_wipefs (const char *device)
{
int force;
int r;
char *err = NULL;
const size_t MAX_ARGS = 16;
const char *argv[MAX_ARGS];
size_t i = 0;
const char *wipefs[] = {str_wipefs, "-a", device, NULL};
r = commandv (NULL, &err, wipefs);
force = wipefs_has_force_option ();
if (force == -1)
return -1;
ADD_ARG (argv, i, str_wipefs);
ADD_ARG (argv, i, "-a");
if (force)
ADD_ARG (argv, i, "--force");
ADD_ARG (argv, i, device);
ADD_ARG (argv, i, NULL);
r = commandv (NULL, &err, argv);
if (r == -1) {
reply_with_error ("%s", err);
free (err);