Fix lvresize test on RHEL 5, by fixing guestfs_e2fsck_l.

The problem is that mkfs was making an ext2 filesystem,
which later we were checking with e4fsck.  e4fsck corrects
an "error" on the filesystem:
  /dev/VG/LV: Adding dirhash hint to filesystem.
e4fsck returns 1 (errors corrected) which we were interpreting
as an error return.

diff --git a/daemon/ext2.c b/daemon/ext2.c
index ff6459b..c90ee05 100644 (file)
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -310,8 +310,15 @@ do_e2fsck_f (const char *device)
   if (e2prog (prog) == -1)
     return -1;
 
-  r = command (NULL, &err, prog, "-p", "-f", device, NULL);
-  if (r == -1) {
+  /* 0 = no errors, 1 = errors corrected.
+   *
+   * >= 4 means uncorrected or other errors.
+   *
+   * 2, 3 means errors were corrected and we require a reboot.  This is
+   * a difficult corner case.
+   */
+  r = commandr (NULL, &err, prog, "-p", "-f", device, NULL);
+  if (r == -1 || r >= 2) {
     reply_with_error ("%s", err);
     free (err);
     return -1;