Read label on UFS1.

	* grub-core/fs/ufs.c (grub_ufs_label): Remove MODE_UFS2 condition.
	(grub_ufs_fs): Always set .label.

diff --git a/ChangeLog b/ChangeLog
index 79b930c1ecf9e933616f6a24296ca4cc8947b9d2..211a5f9ca5b6be7c2fc19720c6e1b1001cab9e6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Read label on UFS1.
+
+       * grub-core/fs/ufs.c (grub_ufs_label): Remove MODE_UFS2 condition.
+       (grub_ufs_fs): Always set .label.
+
 2011-10-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Use shifts in UFS.

diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c
index bfcb7148fb3fece4b2c9df7f647d86780a591052..e951d6ce3cecdd751a32596fa26ad7e71792c234 100644 (file)
--- a/grub-core/fs/ufs.c
+++ b/grub-core/fs/ufs.c
@@ -705,8 +705,6 @@ grub_ufs_close (grub_file_t file)
   return GRUB_ERR_NONE;
 }
 
-
-#ifdef MODE_UFS2
 static grub_err_t
 grub_ufs_label (grub_device_t device, char **label)
 {
@@ -726,7 +724,6 @@ grub_ufs_label (grub_device_t device, char **label)
 
   return grub_errno;
 }
-#endif
 
 static grub_err_t
 grub_ufs_uuid (grub_device_t device, char **uuid)
@@ -790,9 +787,7 @@ static struct grub_fs grub_ufs_fs =
     .open = grub_ufs_open,
     .read = grub_ufs_read,
     .close = grub_ufs_close,
-#ifdef MODE_UFS2
     .label = grub_ufs_label,
-#endif
     .uuid = grub_ufs_uuid,
     .mtime = grub_ufs_mtime,
     .next = 0