* grub-core/fs/affs.c (grub_affs_bblock): Revert flags.

	(GRUB_AFFS_FLAG_FFS): Put back where it was.
	(grub_affs_mount): Revert the correct version checking.

diff --git a/ChangeLog b/ChangeLog
index 092b4a8a82f3f34d4ddf26ac5dad011fb302d6fa..df581a2b4db50daa7cb17de37ab27e31d89bde42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/affs.c (grub_affs_bblock): Revert flags.
+       (GRUB_AFFS_FLAG_FFS): Put back where it was.
+       (grub_affs_mount): Revert the correct version checking.
+
 2012-01-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * docs/grub.texi (Unicode): Mention several other unsupported features.

diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c
index b551cfcdb46fdd9496e9a42959f91810f01749b4..cdbf62e34926b16d22671a67ebaf757727d34880 100644 (file)
--- a/grub-core/fs/affs.c
+++ b/grub-core/fs/affs.c
@@ -33,11 +33,15 @@ GRUB_MOD_LICENSE ("GPLv3+");
 struct grub_affs_bblock
 {
   grub_uint8_t type[3];
-  grub_uint8_t version;
+  grub_uint8_t flags;
   grub_uint32_t checksum;
   grub_uint32_t rootblock;
 } __attribute__ ((packed));
 
+/* Set if the filesystem is a AFFS filesystem.  Otherwise this is an
+   OFS filesystem.  */
+#define GRUB_AFFS_FLAG_FFS     1
+
 /* The affs rootblock.  */
 struct grub_affs_rblock
 {
@@ -192,7 +196,7 @@ grub_affs_mount (grub_disk_t disk)
     }
 
   /* Test if the filesystem is a OFS filesystem.  */
-  if (data->bblock.version < 1)
+  if (! (data->bblock.flags & GRUB_AFFS_FLAG_FFS))
     {
       grub_error (GRUB_ERR_BAD_FS, "OFS not yet supported");
       goto fail;