[parted-devel] Ready for 1.8.1?

[leslie.polzer at gmx.net]

On Fri, Dec 01, 2006 at 03:10:09PM -0500, David Cantrell wrote:

> Is the ext2 resize code in the master branch or the parted-1.8.x
> branch? I'm releasing off the 1.8.x branch and if the new ext2 is in
> master, it shouldn't matter.
Both, it's from 1.7.
The change is trivial, I have attached a patch against ext2_resize.c .

  Leslie

-- 
gpg --keyserver pgp.mit.edu --recv-keys DD4EBF83
http://nic-nac-project.de/~skypher/
-------------- next part --------------
diff --git a/libparted/fs/ext2/ext2_resize.c b/libparted/fs/ext2/ext2_resize.c
index 54899f7..bf8548c 100644
--- a/libparted/fs/ext2/ext2_resize.c
+++ b/libparted/fs/ext2/ext2_resize.c
@@ -687,20 +687,14 @@ int ext2_resize_fs(struct ext2_fs *fs, b
 		fs->metadirty |= EXT2_META_SB;
 	}
 
-	if (!ext2_determine_itoffset(fs) && ped_exception_throw (
-                        PED_EXCEPTION_WARNING,
-                        PED_EXCEPTION_OK_CANCEL,
-                        _("A resize operation on this file system will "
-                          "use EXPERIMENTAL code\n"
-                          "that MAY CORRUPT it (although it hasn't done"
-                          "so yet\n"
-                          "in the past).\n"
-                          "You should at least backup your data and "
-                          "run 'e2fsck -f' afterwards."))
-                == PED_EXCEPTION_CANCEL)
-        {
-	        return 0;
-        }
+	if (!ext2_determine_itoffset(fs))
+        ped_exception_throw (
+                PED_EXCEPTION_NO_FEATURE,
+                PED_EXCEPTION_OK,
+                _("GNU Parted cannot resize this file system, please use"
+                  "resize2fs."));
+
+        return 0;
 
 	if (fs->opt_verbose)
 		fprintf(stderr, "ext2_resize_fs\n");