[klibc] Probe ext2 and ext3 before minix

[Jeff Bailey]

Got this bug report for Ubuntu's klibc:
https://launchpad.net/distros/ubuntu/+source/klibc/+bug/37528

> In the fstype tool there is a problem if the lower 16 bit of number of
> free inodes in a ext3 filesystem happens to match minix filesystem 
> magic.
>
> This will cause the system not to boot since ubuntu will attempt to
> mount the filesystem as a minix filesystem.

I suspect the simplest solution is to probe for ext3 and ext2 before
minix.

--- fstype.c.old        2006-03-31 15:51:31.000000000 -0500
+++ fstype.c    2006-03-31 15:59:39.000000000 -0500
@@ -229,6 +229,10 @@
        int             (*identify)(const void *, unsigned long long *);
 };

+/* Minix needs to come after ext[23] to make sure that the
+ * minix can't get mistaken for it.
+ */
+
 static struct imagetype images[] = {
        { 0,            "gzip",         gzip_image      },
        { 0,            "cramfs",       cramfs_image    },
@@ -237,9 +241,9 @@
        { 0,            "luks",         luks_image      },
        { 0,            "lvm2",         lvm2_image      },
        { 1,            "lvm2",         lvm2_image      },
-       { 1,            "minix",        minix_image     },
        { 1,            "ext3",         ext3_image      },
        { 1,            "ext2",         ext2_image      },
+       { 1,            "minix",        minix_image     },
        { 8,            "reiserfs",     reiserfs_image  },
        { 64,           "reiserfs",     reiserfs_image  },
        { 32,           "jfs",          jfs_image       },


Signed-off-by: Jeff Bailey <jbailey at ubuntu.com>

* Canonical Ltd * Ubuntu Service and Support * +1 514 691 7221 *

Linux for Human Beings.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: Ceci est une partie de message
	=?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?=
Url : http://www.zytor.com/pipermail/klibc/attachments/20060331/88715061/attachment.bin