search for: do_e2fsck

From: Wanlong Gao <gaowanlong at cn.fujitsu.com> Tweak the error message "e2fsck -f" and "e2fsck -fy". Indicate the user to use the correct and/or forceall options. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/ext2.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index

...ommandf (NULL, &err, - COMMAND_FLAG_FOLD_STDOUT_ON_STDERR, - str_e2fsck, "-fy", device, NULL); - if (r == -1) { - reply_with_error ("%s", err); - return -1; - } + optargs_bitmask = GUESTFS_E2FSCK_FORCEALL_BITMASK; + r = do_e2fsck (device, 0, 1); } - return 0; + return r; } int -- 1.8.3.1

...t always indicate a failure. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- daemon/ext2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 65ddae6..8ef6d5f 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -296,9 +296,9 @@ do_e2fsck (const char *device, ADD_ARG (argv, i, device); ADD_ARG (argv, i, NULL); - r = commandvf (NULL, &err, - COMMAND_FLAG_FOLD_STDOUT_ON_STDERR, - argv); + r = commandrvf (NULL, &err, + COMMAND_FLAG_FOLD_STDOUT_ON_STDERR, +...

From: Wanlong Gao <gaowanlong at cn.fujitsu.com> Tweak the error message "e2fsck -f" and "e2fsck -fy". Indicate the user to use the correct and/or forceall options. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/ext2.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index

..."%s\"\n", i, lines[i]); + + if ((p = strstr (lines[i], pattern))) { + if (sscanf (p + strlen(pattern), "%" SCNd64, &ret) != 1) + return -1; + return ret; + } + } + + return -1; +} + /* Takes optional arguments, consult optargs_bitmask. */ int do_e2fsck (const char *device, diff --git a/generator/actions.ml b/generator/actions.ml index a76b466..78de100 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -12751,6 +12751,20 @@ Only some filesystem types support setting UUIDs. To read the UUID on a filesystem, call C<guestfs_vfs_uuid...

..."%s\"\n", i, lines[i]); + + if ((p = strstr (lines[i], pattern))) { + if (sscanf (p + strlen(pattern), "%" SCNu64, &ret) != 1) + return -1; + return ret; + } + } + + return -1; +} + /* Takes optional arguments, consult optargs_bitmask. */ int do_e2fsck (const char *device, diff --git a/generator/actions.ml b/generator/actions.ml index a76b466..7e2bfac 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -12751,6 +12751,16 @@ Only some filesystem types support setting UUIDs. To read the UUID on a filesystem, call C<guestfs_vfs_uuid...

https://bugzilla.redhat.com/show_bug.cgi?id=755729 This bug reports that the error message printed by the resize2fs API calls (which comes directly from the resize2fs command) says: Please run 'e2fsck -f /dev/vda1' first. That command is not possible from guestfish (where it would be 'e2fsck-f' or 'e2fsck ... forceall:true'). Fixing that bug caused this bug:

...r (lines[i], pattern))) { > + if (sscanf (p + strlen(pattern), "%" SCNu64, &ret) != 1) > + return -1; > + return ret; > + } > + } > + > + return -1; > +} > + > /* Takes optional arguments, consult optargs_bitmask. */ > int > do_e2fsck (const char *device, > diff --git a/generator/actions.ml b/generator/actions.ml > index a76b466..7e2bfac 100644 > --- a/generator/actions.ml > +++ b/generator/actions.ml > @@ -12751,6 +12751,16 @@ Only some filesystem types support setting UUIDs. > > To read the UUID on a fil...

...mounted_run_e2fsck (device) == -1) return -1; - r = command (NULL, &err, prog, "-M", device, NULL); + r = command (NULL, &err, str_resize2fs, "-M", device, NULL); if (r == -1) { reply_with_error ("%s", err); free (err); @@ -310,9 +312,8 @@ do_e2fsck (const char *device, char *err; size_t i = 0; int r; - char prog[] = "e2fsck"; - if (e2prog (prog) == -1) + if (e2prog (str_e2fsck) == -1) return -1; /* Default if not selected. */ @@ -326,7 +327,7 @@ do_e2fsck (const char *device, return -1; } - ADD_ARG...

...k (device) == -1) return -1; - r = command (NULL, &err, "resize2fs", "-M", device, NULL); + r = command (NULL, &err, str_resize2fs, "-M", device, NULL); if (r == -1) { reply_with_error ("%s", err); free (err); @@ -272,7 +279,7 @@ do_e2fsck (const char *device, return -1; } - ADD_ARG (argv, i, "e2fsck"); + ADD_ARG (argv, i, str_e2fsck); ADD_ARG (argv, i, "-f"); if (correct) @@ -319,7 +326,7 @@ do_mke2journal (int blocksize, const char *device) snprintf (blocksize_s, sizeof blocksize_s, "...

...r = command (&out, &err, str_resize2fs, "-P", "-f", device, NULL); + r = command (&out, &err, "resize2fs", "-P", "-f", device, NULL); if (r == -1) { reply_with_error ("%s", err); return -1; @@ -376,7 +368,7 @@ do_e2fsck (const char *device, return -1; } - ADD_ARG (argv, i, str_e2fsck); + ADD_ARG (argv, i, "e2fsck"); ADD_ARG (argv, i, "-f"); if (correct) @@ -425,7 +417,7 @@ do_mke2journal (int blocksize, const char *device) wipe_device_before_mkfs (device); r = comman...

...r = command (&out, &err, str_resize2fs, "-P", "-f", device, NULL); + r = command (&out, &err, "resize2fs", "-P", "-f", device, NULL); if (r == -1) { reply_with_error ("%s", err); return -1; @@ -376,7 +371,7 @@ do_e2fsck (const char *device, return -1; } - ADD_ARG (argv, i, str_e2fsck); + ADD_ARG (argv, i, "e2fsck"); ADD_ARG (argv, i, "-f"); if (correct) @@ -425,7 +420,7 @@ do_mke2journal (int blocksize, const char *device) wipe_device_before_mkfs (device); r = comman...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’