* grub-core/fs/btrfs.c (grub_btrfs_fs) [GRUB_UTIL]: Set

reserved_first_sector to 1.  btrfs reserves plenty of space for boot
loaders.
Reported by: Gene Cumm.  Fixes Ubuntu bug #757446.

diff --git a/ChangeLog b/ChangeLog
index dbcbb96519d3b7bca86fda0f9aa15d8988904a44..295a23d1a17d89bce7615e9df1486f699147a5b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-11  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/fs/btrfs.c (grub_btrfs_fs) [GRUB_UTIL]: Set
+       reserved_first_sector to 1.  btrfs reserves plenty of space for boot
+       loaders.
+       Reported by: Gene Cumm.  Fixes Ubuntu bug #757446.
+
 2011-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-fstest.c (cmd_cmp): Check that sizes match.

diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 179891da8a3121b03f2140c42787e27066ae506b..11b8dba33c9b9317f84a2868b931697a6cfc759d 100644 (file)
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -122,6 +122,9 @@ static struct grub_fs grub_btrfs_fs =
     .dir = grub_btrfs_dir,
     .open = grub_btrfs_open,
     .uuid = grub_btrfs_uuid,
+#ifdef GRUB_UTIL
+    .reserved_first_sector = 1,
+#endif
   };
 
 GRUB_MOD_INIT(btrfs)